lib/gooddata/commands/process.rb in gooddata-0.6.0.pre6 vs lib/gooddata/commands/process.rb in gooddata-0.6.0.pre7

@@ -1,87 +1,55 @@
 module GoodData::Command
   class Process
 
     def self.list(options={})
-      # with project usage
-      processes = GoodData::Process[:all]
+      GoodData.with_project(options[:project_id]) do
+        processes = GoodData::Process[:all]
+      end
     end
 
     def self.get(options={})
       id = options[:process_id]
       fail "Unspecified process id" if id.nil?
-      GoodData::Process[id]
+      
+      GoodData.with_project(options[:project_id]) do
+        GoodData::Process[id]
+      end
     end
 
-    def self.with_deploy(dir, options={}, &block) 
+    def self.deploy(dir, options={})
       verbose = options[:verbose] || false
-      if block
-        begin
-          res = deploy_graph(dir, options)
-          block.call(res)
-        ensure
-          # self_link = res["process"]["links"]["self"]
-          # GoodData.delete(self_link)
-        end
-      else
-        deploy_graph(dir, options)
+      GoodData.with_project(options[:project_id]) do
+        deploy_graph(dir, options.merge({:files_to_exclude => [options[:params]]}))
       end
     end
 
-    def self.deploy_graph(dir, options={}) 
-      dir = Pathname(dir) || fail("Directory is not specified")
-      fail "\"#{dir}\" is not a directory" unless dir.directory?
-      project_id = options[:project_id] || fail("Project Id has to be specified")
-      
-
-      type = options[:type] || fail("Type of deployment is not specified")
-      deploy_name = options[:name]
+    def self.with_deploy(dir, options={}, &block) 
       verbose = options[:verbose] || false
-      project_pid = options[:project_pid]
-      puts HighLine::color("Deploying #{dir}", HighLine::BOLD) if verbose
-      res = nil
-
-      Tempfile.open("deploy-graph-archive") do |temp|
-        
-        Zip::OutputStream.open(temp.path) do |zio|
-          Dir.glob(dir + "**/*") do |item|
-            puts "including #{item}" if verbose
-            unless File.directory?(item)
-              zio.put_next_entry(item)
-              zio.print IO.read(item)
-            end
+      GoodData.with_project(options[:project_id]) do
+        if block
+          begin
+            res = deploy_graph(dir, options.merge({:files_to_exclude => [options[:params]]}))
+            block.call(res)
+          ensure
+            # self_link = res["process"]["links"]["self"]
+            # GoodData.delete(self_link)
           end
-        end
-
-        GoodData.upload_to_user_webdav(temp.path)
-        process_id = options[:process]
-        
-        data = {
-          :process => {
-            :name => deploy_name,
-            :path => "/uploads/#{File.basename(temp.path)}",
-            :type => type
-          }
-        }
-        res = if process_id.nil?
-          GoodData.post("/gdc/projects/#{project_pid}/dataload/processes", data)
         else
-          GoodData.put("/gdc/projects/#{project_pid}/dataload/processes/#{process_id}", data)
+          deploy_graph(dir, options.merge({:files_to_exclude => [options[:params]]}))
         end
       end
-      puts HighLine::color("Deploy DONE #{dir}", HighLine::BOLD) if verbose
-      res
     end
 
     def self.execute_process(link, dir, options={})
       dir = Pathname(dir)
       type = :ruby
       if type == :ruby 
         result = GoodData.post(link, {
           :execution => {
-           :graph => (dir + "main.rb").to_s,
-           :params => options[:params]
+           :graph => ("./main.rb").to_s,
+           :params => options[:expanded_params]
           }
         })
         begin
           GoodData.poll(result, "executionTask")
         rescue RestClient::RequestFailed => e
@@ -120,18 +88,63 @@
       dir = Pathname(dir)
       name = options[:name] || "Temporary deploy[#{dir}][#{options[:project_name]}]"
 
       with_deploy(dir, options.merge(:name => name)) do |deploy_response|
         puts HighLine::color("Executing", HighLine::BOLD) if verbose
-        # if email.nil?
-        #   result = execute_process(deploy_response["process"]["links"]["executions"], dir, options)
-        # else
-          # create_email_channel(options) do |channel_response|
-            # subscribe_on_finish(:success, channel_response, deploy_response, options)
-            result = execute_process(deploy_response["process"]["links"]["executions"], dir, options)
-          # end
-        # end
+        result = execute_process(deploy_response["process"]["links"]["executions"], dir, options)
       end
     end
+
+    private
+    def self.deploy_graph(dir, options={})
+      dir = Pathname(dir) || fail("Directory is not specified")
+      fail "\"#{dir}\" is not a directory" unless dir.directory?
+      files_to_exclude = options[:files_to_exclude].map {|p| Pathname(p)}
+
+      # project_id = options[:project_id] || fail("Project Id has to be specified")
+      
+
+      type = options[:type] || "GRAPH"
+      deploy_name = options[:name]
+      verbose = options[:verbose] || false
+      
+      puts HighLine::color("Deploying #{dir}", HighLine::BOLD) if verbose
+      res = nil
+
+      Tempfile.open("deploy-graph-archive") do |temp|
+        Zip::OutputStream.open(temp.path) do |zio|
+          FileUtils::cd(dir) do
+
+            files_to_pack = Dir.glob("./**/*").reject {|f| files_to_exclude.include?(Pathname(dir) + f)}
+            files_to_pack.each do |item|
+              puts "including #{item}" if verbose
+              unless File.directory?(item)
+                zio.put_next_entry(item)
+                zio.print IO.read(item)
+              end
+            end
+          end
+        end
+
+        GoodData.upload_to_user_webdav(temp.path)
+        process_id = options[:process]
+        
+        data = {
+          :process => {
+            :name => deploy_name,
+            :path => "/uploads/#{File.basename(temp.path)}",
+            :type => type
+          }
+        }
+        res = if process_id.nil?
+          GoodData.post("/gdc/projects/#{GoodData.project.pid}/dataload/processes", data)
+        else
+          GoodData.put("/gdc/projects/#{GoodData.project.pid}/dataload/processes/#{process_id}", data)
+        end
+      end
+      puts HighLine::color("Deploy DONE #{dir}", HighLine::BOLD) if verbose
+      res
+    end
+
 
   end
 end