Merge pull request #280 from fluke777/master

Merge before release 0.6.8

Author: fluke777

lib/gooddata/cli/commands/domain_cmd.rb

@@ -37,9 +37,8 @@
         fail ArgumentError, 'Domain name has to be provided' if domain.nil? || domain.empty?
 
         users = GoodData::Command::Domain.list_users(domain, :client => client)
-        puts users.map { |u| [u['firstName'], u['lastName'], u['login']].join(',') }
+        puts users.map { |u| [u.first_name, u.last_name, u.login].join(',') }
       end
     end
   end
-
 end

lib/gooddata/cli/commands/process_cmd.rb

@@ -35,11 +35,11 @@
     c.command :list do |list|
       list.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
         opts = opts.merge(:project_id => args[0]) if args.length > 0
-        processes = GoodData::Command::Process.list(opts)
+        processes = GoodData::Command::Process.list(opts.merge(client: client))
         processes.each do |process|
-          puts "#{process.name},#{GoodData.connection.url + process.uri}"
+          puts "#{process.name},#{client.connection.server_url + process.uri}"
         end
       end
     end
@@ -48,8 +48,8 @@
     c.command :show do |get|
       get.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        pp GoodData::Command::Process.get(options.merge(global_options)).raw_data
+        client = GoodData.connect(opts)
+        pp GoodData::Command::Process.get(opts.merge(client: client)).raw_data
       end
     end
 
@@ -61,8 +61,9 @@
         name = opts[:name]
         fail 'You have to provide a directory or a file to deploy. Use --dir param' if dir.nil? || dir.empty?
         fail 'You have to provide a name of the deployed process.  Use --name param' if name.nil? || name.empty?
-        GoodData.connect(opts)
-        pp GoodData::Command::Process.deploy(dir, options.merge(global_options))
+        client = GoodData.connect(opts)
+        process = GoodData::Command::Process.deploy(dir, opts.merge(client: client))
+        puts "Process #{process.uri} was deployed"
       end
     end
 
@@ -72,8 +73,9 @@
         opts = options.merge(global_options)
         process_id = opts[:process_id]
         fail 'You have to provide a process id. Use --process_id param' if process_id.nil? || process_id.empty?
-        GoodData.connect(opts)
-        pp GoodData::Command::Process.delete(process_id, opts)
+        client = GoodData.connect(opts)
+        GoodData::Command::Process.delete(process_id, opts.merge(client: client))
+        puts "Process #{process_id} was deleted"
       end
     end
 

lib/gooddata/cli/commands/project_cmd.rb

@@ -31,14 +31,14 @@
         token = opts[:token] || ask('token')
 
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
         project = GoodData::Command::Project.create(
           :title => title,
           :summary => summary,
           :template => template,
-          :token => token
-        )
-        puts "Project '#{project.title}' with id #{project.uri} created successfully!"
+          :token => token,
+          client: client)
+        puts "Project '#{project.title}' with id #{project.pid} created successfully!"
       end
     end
 
@@ -47,8 +47,8 @@
       delete.action do |global_options, options, args|
         id = global_options[:project_id]
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        GoodData::Command::Project.delete(id)
+        client = GoodData.connect(opts)
+        GoodData::Command::Project.delete(id, opts.merge(client: client))
       end
     end
 
@@ -73,8 +73,8 @@
         opts[:auth_token] = token
         fail 'You have to provide a token for creating a project. Please use parameter --token' if token.nil? || token.empty?
 
-        GoodData.connect(opts)
-        new_project = GoodData::Command::Project.clone(id, opts)
+        client = GoodData.connect(opts)
+        new_project = GoodData::Command::Project.clone(id, opts.merge(client: client))
         puts "Project with title \"#{new_project.title}\" was cloned with id #{new_project.pid}"
       end
     end
@@ -92,26 +92,26 @@
         fail 'Role name has to be provided' if role.nil? || role.empty?
 
         msg = args[2]
-        msg = GoodData::Command::Project::DEFAULT_INVITE_MESSAGE if msg.nil? || msg.empty?
+        msg = GoodData::Project::DEFAULT_INVITE_MESSAGE if msg.nil? || msg.empty?
 
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
 
-        GoodData::Command::Project.invite(project_id, email, role, msg)
+        GoodData::Command::Project.invite(project_id, email, role, msg, opts.merge(client: client))
       end
     end
 
     c.desc 'List users'
     c.command :users do |list|
       list.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
 
         pid = global_options[:project_id]
         fail 'Project ID has to be provided' if pid.nil? || pid.empty?
 
-        user_list = GoodData::Command::Project.users(pid)
-        puts user_list.map { |u| [u[:last_name], u[:first_name], u[:login], u[:uri]].join(',') }
+        user_list = GoodData::Command::Project.users(pid, opts.merge(client: client))
+        puts user_list.map { |u| [u.last_name, u.first_name, u.login, u.uri].join(',') }
       end
     end
 
@@ -120,8 +120,8 @@
       show.action do |global_options, options, args|
         id = global_options[:project_id]
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        p = GoodData::Command::Project.show(id)
+        client = GoodData.connect(opts)
+        p = GoodData::Command::Project.show(id, client: client)
         pp p.data
       end
     end
@@ -130,9 +130,9 @@
     c.command :build do |show|
       show.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
         spec, _ = GoodData::Command::Project.get_spec_and_project_id('.')
-        new_project = GoodData::Command::Project.build(opts.merge(:spec => spec))
+        new_project = GoodData::Command::Project.build(opts.merge(spec: spec, client: client))
         puts "Project was created. New project PID is #{new_project.pid}, URI is #{new_project.uri}."
       end
     end
@@ -151,27 +151,26 @@
       end
     end
 
-    c.desc 'Roles'
+    c.desc 'Shows roles in the project'
     c.command :roles do |roles|
       roles.action do |global_options, options, args|
         project_id = global_options[:project_id]
         fail 'Project ID has to be provided' if project_id.nil? || project_id.empty?
 
         opts = options.merge(global_options)
-        GoodData.connect(opts)
+        client = GoodData.connect(opts)
 
-        roles = GoodData::Command::Project.roles(project_id)
-
-        puts roles.map { |r| [r['url'], r['role']['projectRole']['meta']['title']].join(',') }
+        roles = GoodData::Command::Project.roles(project_id, client: client)
+        puts roles.map { |r| [r.uri, r.title].join(',') }
       end
     end
 
-    c.desc 'You can run project validation which will check RI integrity and other problems.'
+    c.desc 'You can run project validation which will check RI and other problems.'
     c.command :validate do |show|
       show.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        pp GoodData::Command::Project.validate(global_options[:project_id])
+        client = GoodData.connect(opts)
+        pp GoodData::Command::Project.validate(global_options[:project_id], opts.merge(client: client))
       end
     end
   end

lib/gooddata/cli/commands/projects_cmd.rb

@@ -12,8 +12,8 @@
     c.command :list do |list|
       list.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        list = GoodData::Command::Projects.list
+        client = GoodData.connect(opts)
+        list = GoodData::Command::Projects.list(client: client)
         puts list.map { |p| [p.uri, p.title].join(',') }
       end
     end

lib/gooddata/cli/commands/role_cmd.rb

@@ -9,7 +9,7 @@
 
 GoodData::CLI.module_eval do
 
-  desc 'Run ruby bricks either locally or remotely deployed on our server'
+  desc 'Run ruby bricks either locally or remotely deployed on our server. Currently private alpha.'
 # arg_name 'show'
   command :run_ruby do |c|
 

lib/gooddata/cli/commands/run_ruby_cmd.rb

@@ -13,8 +13,8 @@
     c.command :show do |show|
       show.action do |global_options, options, args|
         opts = options.merge(global_options)
-        GoodData.connect(opts)
-        pp GoodData::Command::User.show
+        client = GoodData.connect(opts)
+        pp GoodData::Command::User.show(client: client)
       end
     end
   end

lib/gooddata/cli/commands/user_cmd.rb

@@ -41,7 +41,7 @@
     # return false to skip default error handling
     # binding.pry
     # pp exception.backtrace
-    pp exception
+    # pp exception
     true
   end
 end

lib/gooddata/cli/hooks.rb

@@ -30,7 +30,7 @@
   flag [:p, :project_id]
 
   desc 'Server'
-  default_value GoodData::Connection::DEFAULT_URL
+  default_value GoodData::Rest::Connection::DEFAULT_URL
   arg_name 'server'
   flag [:s, :server]
 

lib/gooddata/cli/shared.rb

@@ -18,21 +18,29 @@ def get(options = {})
 
           id = options[:process_id]
           fail ArgumentError, 'None or invalid process_id' if id.nil? || id.empty?
-
-          GoodData.with_project(pid) do
-            GoodData::Process[id]
+          c = options[:client]
+          c.with_project(pid) do |project|
+            project.processes(id)
           end
         end
 
         def delete(process_id, options = { :client => GoodData.connection, :project => GoodData.project })
-          process = GoodData::Process[process_id, options]
+          c = options[:client]
+          pid = options[:project_id]
+          process = c.with_project(pid) do |project|
+            project.processes(process_id)
+          end
           process.delete
         end
 
         # TODO: check files_to_exclude param. Does it do anything? It should check that in case of using CLI, it makes sure the files are not deployed
         def deploy(dir, options = { :client => GoodData.connection, :project => GoodData.project })
           params = options[:params].nil? ? [] : [options[:params]]
-          GoodData::Process.deploy(dir, options.merge(:files_to_exclude => params))
+          c = options[:client]
+          pid = options[:project_id]
+          c.with_project(pid) do |project|
+            project.deploy_process(dir, options.merge(:files_to_exclude => params))
+          end
         end
 
         def execute_process(process_id, executable, options = { :client => GoodData.connection, :project => GoodData.project })