gooddata 0.6.0.pre11 → 0.6.0

data/lib/gooddata/commands/process.rb

@@ -1,151 +1,155 @@
-module GoodData::Command
-  class Process
+# encoding: UTF-8
+
+module GoodData
+  module Command
+    class Process
+      class << self
+        def list(options={})
+          GoodData.with_project(options[:project_id]) do
+            processes = GoodData::Process[:all]
+          end
+        end
 
-    def self.list(options={})
-      GoodData.with_project(options[:project_id]) do
-        processes = GoodData::Process[:all]
-      end
-    end
+        def get(options={})
+          id = options[:process_id]
+          fail 'Unspecified process id' if id.nil?
 
-    def self.get(options={})
-      id = options[:process_id]
-      fail "Unspecified process id" if id.nil?
-      
-      GoodData.with_project(options[:project_id]) do
-        GoodData::Process[id]
-      end
-    end
+          GoodData.with_project(options[:project_id]) do
+            GoodData::Process[id]
+          end
+        end
 
-    def self.deploy(dir, options={})
-      verbose = options[:verbose] || false
-      GoodData.with_project(options[:project_id]) do
-        params = options[:params].nil? ? [] : [options[:params]]
-        deploy_graph(dir, options.merge({:files_to_exclude => params}))
-      end
-    end
+        def deploy(dir, options={})
+          verbose = options[:verbose] || false
+          GoodData.with_project(options[:project_id]) do
+            params = options[:params].nil? ? [] : [options[:params]]
+            deploy_graph(dir, options.merge({:files_to_exclude => params}))
+          end
+        end
 
-    def self.with_deploy(dir, options={}, &block) 
-      verbose = options[:verbose] || false
-      GoodData.with_project(options[:project_id]) do
-      params = options[:params].nil? ? [] : [options[:params]]
-        if block
-          begin
-            res = deploy_graph(dir, options.merge({:files_to_exclude => params}))
-            block.call(res)
-          ensure
-            self_link = res && res["process"]["links"]["self"]
-            GoodData.delete(self_link)
+        def with_deploy(dir, options={}, &block)
+          verbose = options[:verbose] || false
+          GoodData.with_project(options[:project_id]) do |project|
+            params = options[:params].nil? ? [] : [options[:params]]
+            if block
+              begin
+                res = deploy_graph(dir, options.merge({:files_to_exclude => params}))
+                block.call(res)
+              ensure
+                self_link = res && res['process']['links']['self']
+                GoodData.delete(self_link)
+              end
+            else
+              deploy_graph(dir, options.merge({:files_to_exclude => params}))
+            end
           end
-        else
-          deploy_graph(dir, options.merge({:files_to_exclude => params}))
         end
-      end
-    end
 
-    def self.execute_process(link, dir, options={})
-      dir = Pathname(dir)
-      type = :ruby
-      if type == :ruby 
-        result = GoodData.post(link, {
-          :execution => {
-           :graph => ("./main.rb").to_s,
-           :params => options[:expanded_params]
-          }
-        })
-        begin
-          GoodData.poll(result, "executionTask")
-        rescue RestClient::RequestFailed => e
-
-        ensure
-          result = GoodData.get(result["executionTask"]["links"]["detail"])
-          if result["executionDetail"]["status"] == "ERROR"
-            fail "Runing process failed. You can look at a log here #{result["executionDetail"]["logFileName"]}"
+        def execute_process(link, dir, options={})
+          dir = Pathname(dir)
+          type = :ruby
+          if type == :ruby
+            result = GoodData.post(link, {
+              :execution => {
+                :graph => ('./main.rb').to_s,
+                :params => options[:expanded_params]
+              }
+            })
+            begin
+              GoodData.poll(result, 'executionTask')
+            rescue RestClient::RequestFailed => e
+
+            ensure
+              result = GoodData.get(result['executionTask']['links']['detail'])
+              if result['executionDetail']['status'] == 'ERROR'
+                fail "Runing process failed. You can look at a log here #{result["executionDetail"]["logFileName"]}"
+              end
+            end
+            result
+          else
+            result = GoodData.post(link, {
+              :execution => {
+                :graph => dir + 'graphs/main.grf',
+                :params => {}
+              }
+            })
+            begin
+              GoodData.poll(result, 'executionTask')
+            rescue RestClient::RequestFailed => e
+
+            ensure
+              result = GoodData.get(result['executionTask']['links']['detail'])
+              if result['executionDetail']['status'] == 'ERROR'
+                fail "Runing process failed. You can look at a log here #{result["executionDetail"]["logFileName"]}"
+              end
+            end
+            result
           end
         end
-        result
-      else
-        result = GoodData.post(link, {
-          :execution => {
-           :graph => dir + "graphs/main.grf",
-           :params => {}  
-          }
-        })
-        begin
-          GoodData.poll(result, "executionTask")
-        rescue RestClient::RequestFailed => e
-
-        ensure
-          result = GoodData.get(result["executionTask"]["links"]["detail"])
-          if result["executionDetail"]["status"] == "ERROR"
-            fail "Runing process failed. You can look at a log here #{result["executionDetail"]["logFileName"]}"
+
+        def run(dir, options={})
+          email = options[:email]
+          verbose = options[:v]
+          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
+            result = execute_process(deploy_response['process']['links']['executions'], dir, options)
           end
         end
-        result
-      end
-    end
 
-    def self.run(dir, options={})
-      email = options[:email]
-      verbose = options[:v]
-      dir = Pathname(dir)
-      name = options[:name] || "Temporary deploy[#{dir}][#{options[:project_name]}]"
+        private
 
-      with_deploy(dir, options.merge(:name => name)) do |deploy_response|
-        puts HighLine::color("Executing", HighLine::BOLD) if verbose
-        result = execute_process(deploy_response["process"]["links"]["executions"], dir, options)
-      end
-    end
+        def 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')
 
-    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)
+          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
-          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)
+            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::GREEN) if verbose
+          res
         end
       end
-      puts HighLine::color("Deploy DONE #{dir}", HighLine::GREEN) if verbose
-      res
     end
-
-
   end
-end
+end

data/lib/gooddata/commands/profile.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module GoodData::Command
   class Profile
     class << self

data/lib/gooddata/commands/projects.rb

@@ -1,147 +1,109 @@
+# encoding: UTF-8
+
 module GoodData::Command
   class Projects
+    class << self
+      def list
+        GoodData::Project.all
+      end
 
-    def self.list
-      GoodData::Project.all
-    end
-
-    def self.create(options={})
-      title = options[:title]
-      summary = options[:summary]
-      template = options[:template]
-      token = options[:token]
-
-      GoodData::Project.create(:title => title, :summary => summary, :template => template, :auth_token => token)
-    end
+      # Create new project based on options supplied
+      def create(options={})
+        title = options[:title]
+        summary = options[:summary]
+        template = options[:template]
+        token = options[:token]
 
-    def self.show(id)
-      GoodData::Project[id]
-    end
+        GoodData::Project.create(:title => title, :summary => summary, :template => template, :auth_token => token)
+      end
 
-    def self.clone(project_id, options)
-      with_data   = options[:with_data]
-      with_users  = options[:with_users]
-      title = options[:title]
-      
-      export = {
-        :exportProject => {
-          :exportUsers => with_users ? 1 : 0,
-          :exportData => with_data ? 1 : 0
-        }
-      }
-      
-      result = GoodData.post("/gdc/md/#{project_id}/maintenance/export", export)
-      export_token = result["exportArtifact"]["token"]
-      status_url = result["exportArtifact"]["status"]["uri"]
-
-      state = GoodData.get(status_url)["taskState"]["status"]
-      while state == "RUNNING"
-        sleep 5
-        result = GoodData.get(status_url) 
-        state = result["taskState"]["status"]
+      # Show existing project
+      def show(id)
+        GoodData::Project[id]
       end
 
-      old_project = GoodData::Project[project_id]
-      project_uri = self.create(options.merge({:title => "Clone of #{old_project.title}"}))
-      new_project = GoodData::Project[project_uri]
+      # Clone existing project
+      def clone(project_id, options)
+        with_data = options[:with_data]
+        with_users = options[:with_users]
+        title = options[:title]
+
+        export = {
+          :exportProject => {
+            :exportUsers => with_users ? 1 : 0,
+            :exportData => with_data ? 1 : 0
+          }
+        }
 
-      import = {
-        :importProject => {
-          :token => export_token
+        result = GoodData.post("/gdc/md/#{project_id}/maintenance/export", export)
+        export_token = result['exportArtifact']['token']
+        status_url = result['exportArtifact']['status']['uri']
+
+        state = GoodData.get(status_url)['taskState']['status']
+        while state == 'RUNNING'
+          sleep 5
+          result = GoodData.get(status_url)
+          state = result['taskState']['status']
+        end
+
+        old_project = GoodData::Project[project_id]
+        project_uri = self.create(options.merge({:title => "Clone of #{old_project.title}"}))
+        new_project = GoodData::Project[project_uri]
+
+        import = {
+          :importProject => {
+            :token => export_token
+          }
         }
-      }
-      result = GoodData.post("/gdc/md/#{new_project.obj_id}/maintenance/import", import)
-      status_url = result["uri"]
-      state = GoodData.get(status_url)["taskState"]["status"]
-      while state == "RUNNING"
-        sleep 5
-        result = GoodData.get(status_url) 
-        state = result["taskState"]["status"]
+        result = GoodData.post("/gdc/md/#{new_project.obj_id}/maintenance/import", import)
+        status_url = result['uri']
+        state = GoodData.get(status_url)['taskState']['status']
+        while state == 'RUNNING'
+          sleep 5
+          result = GoodData.get(status_url)
+          state = result['taskState']['status']
+        end
+        true
       end
-      true
-    end
 
-    def self.delete(project_id)
-      p = GoodData::Project[project_id]
-      p.delete
-    end
+      # Delete existing project
+      def delete(project_id)
+        p = GoodData::Project[project_id]
+        p.delete
+      end
 
-    def self.get_spec_and_project_id(base_path)
-      goodfile_path = GoodData::Helpers.find_goodfile(Pathname(base_path))
-      fail "Goodfile could not be located in any parent directory. Please make sure you are inside a gooddata project folder." if goodfile_path.nil?
-      goodfile = JSON.parse(File.read(goodfile_path), :symbolize_names => true)
-      spec_path = goodfile[:model] || fail("You need to specify the path of the build spec")
-      fail "Model path provided in Goodfile \"#{spec_path}\" does not exist" unless File.exist?(spec_path) && !File.directory?(spec_path)
-
-      spec_path = Pathname(spec_path)
-
-      content = File.read(spec_path)
-      spec = if (spec_path.extname == ".rb")
-               eval(content)
-             elsif (spec_path.extname == ".json")
-               JSON.parse(spec_path, :symbolize_names => true)
-             end
-      [spec, goodfile[:project_id]]
-    end
+      # Get Spec and ID (of project)
+      def get_spec_and_project_id(base_path)
+        goodfile_path = GoodData::Helpers.find_goodfile(Pathname(base_path))
+        fail 'Goodfile could not be located in any parent directory. Please make sure you are inside a gooddata project folder.' if goodfile_path.nil?
+        goodfile = MultiJson.load(File.read(goodfile_path), :symbolize_keys => true)
+        spec_path = goodfile[:model] || fail('You need to specify the path of the build spec')
+        fail "Model path provided in Goodfile \"#{spec_path}\" does not exist" unless File.exist?(spec_path) && !File.directory?(spec_path)
+
+        spec_path = Pathname(spec_path)
+
+        content = File.read(spec_path)
+        spec = if (spec_path.extname == '.rb')
+                 eval(content)
+               elsif (spec_path.extname == '.json')
+                 MultiJson.load(spec_path, :symbolize_keys => true)
+               end
+        [spec, goodfile[:project_id]]
+      end
 
-    def self.update(options={})
-      project = options[:project]
-      project_id = project && project.pid
-      fail "You have to provide 'project_id'. You can either provide it through -p flag or even better way is to fill it in in your Goodfile under key \"project_id\". If you just started a project you have to create it first. One way might be through \"gooddata project build\"" if project_id.nil? || project_id.empty?
-      GoodData::Model::ProjectCreator.migrate(:spec => options[:spec], :project => project_id)
-    end
+      # Update project
+      def update(options={})
+        project = options[:project]
+        project_id = project && project.pid
+        fail 'You have to provide "project_id". You can either provide it through -p flag or even better way is to fill it in in your Goodfile under key "project_id". If you just started a project you have to create it first. One way might be through "gooddata project build"' if project_id.nil? || project_id.empty?
+        GoodData::Model::ProjectCreator.migrate(:spec => options[:spec], :project => project_id)
+      end
 
-    def self.build(options={})
-      GoodData::Model::ProjectCreator.migrate(:spec => options[:spec], :token => options[:token])
+      # Build project
+      def build(options={})
+        GoodData::Model::ProjectCreator.migrate(:spec => options[:spec], :token => options[:token])
+      end
     end
-
   end
 end
 
-# module GoodData
-#   module Command
-#     class Projects
-#       class << self
-#         def list
-#           Project.all
-#         end
-#         alias :index :list
-# 
-#       def create
-#         title = ask "Project name"
-#         summary = ask "Project summary"
-#         template = ask "Project template", :default => ''
-# 
-#         project = Project.create :title => title, :summary => summary, :template => template
-# 
-#         puts "Project '#{project.title}' with id #{project.uri} created successfully!"
-#       end
-# 
-#       def show
-#         id = args.shift rescue nil
-#         raise(CommandFailed, "Specify the project key you wish to show.") if id.nil?
-#         connect
-#         pp Project[id].to_json
-#       end
-# 
-#       def delete
-#         raise(CommandFailed, "Specify the project key(s) for the project(s) you wish to delete.") if args.size == 0
-#         connect
-#         while args.size > 0
-#           id = args.shift
-#           project = Project[id]
-#           ask "Do you want to delete the project '#{project.title}' with id #{project.uri}", :answers => %w(y n) do |answer|
-#             case answer
-#             when 'y' then
-#               puts "Deleting #{project.title}..."
-#               project.delete
-#               puts "Project '#{project.title}' with id #{project.uri} deleted successfully!"
-#             when 'n' then
-#               puts "Aborting..."
-#             end
-#           end
-#         end
-#       end
-#     end
-#   end
-# end