gooddata 0.6.24 → 0.6.25

data/README.md

@@ -49,18 +49,27 @@ If you are using gems just
 
 ## Credits
 
-This project was originaly started by Pavel Kolesnikov [ <mailto:pavel@gooddata.com> / [@koles](http://twitter.com/koles) ] 
+**Originaly started by**
 
-Project is now actively developed and maintained by following folks
+Pavel Kolesnikov [ <mailto:pavel@gooddata.com> / [@koles](http://twitter.com/koles) ] 
+
+**Actively developed and maintained by**
+
+- [Tomas Korcak](https://github.com/korczis) [ <mailto:korczis@gmail.com> / [@korczis](http://twitter.com/korczis) ] 
+- [Tomas Svarovsky](https://github.com/fluke777) [ <mailto:svarovsky.tomas@gmail.com> / [@fluke777](http://twitter.com/fluke777) ]
+
+**Contributors**
 
-- [Tomas Korcak](https://github.com/korczis) [<mailto:korczis@gmail.com> / [@korczis](http://twitter.com/korczis)] 
-- [Tomas Svarovsky](https://github.com/fluke777) [<mailto:svarovsky.tomas@gmail.com> / [@fluke777](http://twitter.com/fluke777)]
 - [Patrick McConlogue](https://github.com/thnkr/)
 - [Petr Cvengros](https://github.com/cvengros)
 
-Special thanks to Thomas Watson Steen [ <mailto:w@tson.dk> / [@wa7son](http://twitter.com/wa7son) ].
+For full contributor info see [contributors page](https://github.com/gooddata/gooddata-ruby/graphs/contributors).
+
+**Special thanks to**
+
+- Thomas Watson Steen [ <mailto:w@tson.dk> / [@wa7son](http://twitter.com/wa7son) ].
 
 ## Copyright
 
-Copyright (c) 2010 - 2014 GoodData Corporation and Thomas Watson Steen. See LICENSE for details.
+Copyright (c) 2010 - 2015 GoodData Corporation and Thomas Watson Steen. See LICENSE for details.
 

data/Rakefile

@@ -12,9 +12,11 @@ require 'rspec/core/rake_task'
 
 require 'yard'
 
-desc 'Run Rubocop'
-task :cop do
-  exec 'rubocop lib/ gooddata.gemspec Rakefile'
+require 'rubocop/rake_task'
+
+desc 'Run RuboCop'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.patterns = ['lib/**/*.rb']
 end
 
 desc 'Run continuous integration test'

data/dependency_decisions.yml

@@ -100,3 +100,5 @@
   - :who: 
     :why: 
     :when: 2015-08-03 10:50:05.464030000 Z
+
+

data/gooddata.gemspec

@@ -27,8 +27,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/gooddata/gooddata-ruby'
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1.10.6', '>= 1.10.6'
-  s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.2'
+  s.add_development_dependency 'bundler', '>= 1.10.6'
   s.add_development_dependency 'debase', '~> 0.1', '>= 0.1.7' if !ENV['TRAVIS_BUILD'] && RUBY_VERSION >= '2.0.0'
   s.add_development_dependency 'guard', '~> 2.13', '>= 2.13.0'
   s.add_development_dependency 'guard-rspec', '~> 4.6', '>= 4.6.4'
@@ -54,7 +53,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '~> 1.11', '>= 1.11.2'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.6'
   s.add_dependency 'pmap', '~> 1.0', '>= 1.0.2'
-  s.add_dependency 'pry', '~> 0.9.12.6' # '~> 0.10', '>= 0.10.1'
+  s.add_dependency 'pry', '~> 0.10', '>= 0.10.3'
   s.add_dependency 'restforce', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'rest-client', '~> 1.8', '>= 1.8.0'
   s.add_dependency 'rubyzip', '~> 1.1', '>= 1.1.7'

data/lib/gooddata/cli/cli.rb

@@ -10,15 +10,13 @@ require 'pp'
 # Define GoodData::CLI as GLI Wrapper
 module GoodData
   module CLI
-    include GLI::App
-
     # Require shared part of GLI::App - flags, meta, etc
     require_relative 'shared.rb'
 
     # Require Hooks
     require_relative 'hooks.rb'
 
-    GLI::App.commands_from(File.join(File.dirname(__FILE__), 'commands'))
+    commands_from(File.join(File.dirname(__FILE__), 'commands'))
 
     def self.main(args = ARGV)
       run(args)

data/lib/gooddata/cli/commands/auth_cmd.rb

@@ -7,13 +7,22 @@
 require_relative '../shared'
 require_relative '../../commands/auth'
 
-GoodData::CLI.module_eval do
-  desc 'Work with your locally stored credentials'
-  command :auth do |c|
-    c.desc 'Store your credentials to ~/.gooddata so client does not have to ask you every single time'
-    c.command :store do |store|
-      store.action do |_global_options, _options, _args|
-        GoodData::Command::Auth.store
+module GoodData
+  module CLI
+    desc 'Work with your locally stored credentials'
+    command :auth do |c|
+      c.desc 'Store your credentials to ~/.gooddata so client does not have to ask you every single time'
+      c.command :store do |store|
+        store.action do |_global_options, _options, _args|
+          GoodData::Command::Auth.store
+        end
+      end
+
+      c.desc 'Clean the credentials'
+      c.command :clear do |store|
+        store.action do |_global_options, _options, _args|
+          GoodData::Command::Auth.unstore
+        end
       end
     end
   end

data/lib/gooddata/cli/commands/project_cmd.rb

@@ -10,189 +10,27 @@ require 'pp'
 require_relative '../shared'
 require_relative '../../commands/project'
 
-GoodData::CLI.module_eval do
-  desc 'Manage your project'
-  arg_name 'project_command'
-  command :project do |c|
-    c.desc 'If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project'
-    c.command :jack_in do |jack|
-      jack.action do |global_options, options, _args|
-        opts = options.merge(global_options)
-        GoodData::Command::Project.jack_in(opts)
-      end
-    end
-
-    # TODO: Move away the ask methods. Provide params
-    c.desc 'Create a gooddata project'
-    c.command :create do |create|
-      create.default_value nil
-      create.arg_name :driver
-      create.flag [:driver]
-
-      create.default_value nil
-      create.arg_name :template
-      create.flag [:template]
-
-      create.default_value nil
-      create.arg_name :summary
-      create.flag [:summary]
-
-      create.action do |global_options, options, args|
-        opts = options.merge(global_options)
-
-        title = args[0] || ask('Project name')
-        summary = opts[:summary] || args[1] || ask('Project summary') { |q| q.default = '' }
-        template = opts[:template] || args[2] || ask('Project template')
-        token = opts['token'] || ask('Token')
-        driver = opts[:driver] || ask('Driver') { |q| q.default = 'Pg' }
-
-        opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-        begin
-          project = GoodData::Command::Project.create(
-            :title => title,
-            :summary => summary,
-            :template => template,
-            :token => token,
-            :driver => driver,
-            client: client)
-        rescue => e
-          puts "Error creating project, reason: #{e.inspect}"
-          raise e
+module GoodData
+  module CLI
+    desc 'Manage your project'
+    arg_name 'project_command'
+
+    command :project do |c|
+      c.desc 'If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project'
+      c.command :jack_in do |jack|
+        jack.action do |global_options, options, _args|
+          warn '[DEPRECATION] `gooddata project jack_in` is deprecated.  Please use `gooddata jack_in` instead.'
+          opts = options.merge(global_options)
+          GoodData::Command::Project.jack_in(opts)
         end
-
-        puts "Project '#{project.title}' with id #{project.pid} created successfully!"
-      end
-    end
-
-    c.desc 'Delete a project. Be careful this is impossible to revert'
-    c.command :delete do |delete|
-      delete.action do |global_options, options, _args|
-        id = global_options[:project_id]
-        opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-        GoodData::Command::Project.delete(id, opts.merge(client: client))
-      end
-    end
-
-    c.desc 'Clones a project. Useful for testing'
-    c.command :clone do |clone|
-      clone.desc 'Name of the new project'
-
-      clone.default_value nil
-      clone.arg_name 'cloned_project_name'
-      clone.flag [:t, :title]
-
-      clone.default_value false
-      clone.switch [:u, :users]
-
-      clone.default_value true
-      clone.switch [:d, :data]
-
-      clone.action do |global_options, options, _args|
-        opts = options.merge(global_options)
-        id = global_options[:project_id]
-        token = opts[:token]
-        opts[:auth_token] = token
-        fail 'You have to provide a token for creating a project. Please use parameter --token' if token.nil? || token.empty?
-
-        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
-
-    c.desc 'Invites user to project'
-    c.command :invite do |store|
-      store.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?
-
-        email = args.first
-        fail 'Email of user to be invited has to be provided' if email.nil? || email.empty?
-
-        role = args[1]
-        fail 'Role name has to be provided' if role.nil? || role.empty?
-
-        msg = args[2]
-        msg = GoodData::Project::DEFAULT_INVITE_MESSAGE if msg.nil? || msg.empty?
-
-        opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-
-        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)
-        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, opts.merge(client: client))
-        puts user_list.map { |u| [u.last_name, u.first_name, u.login, u.uri].join(',') }
-      end
-    end
-
-    c.desc 'Shows basic info about a project'
-    c.command :show do |show|
-      show.action do |global_options, options, _args|
-        id = global_options[:project_id]
-        opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-        p = GoodData::Command::Project.show(id, client: client)
-        pp p.data
       end
     end
 
-    c.desc 'If you are in a gooddata project blueprint it will apply the changes. If you do not provide a project id it will build it from scratch and create a project for you.'
-    c.command :build do |show|
-      show.action do |global_options, options, _args|
-        opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-        spec = GoodData::Command::Project.get_spec_and_project_id('.')[0]
-        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
-
-    c.desc 'If you are in a gooddata project blueprint it will apply the changes. If you do not provide a project id it will build it from scratch and create a project for you.'
-    c.command :update do |show|
-      show.action do |global_options, options, _args|
-        opts = options.merge(global_options)
-        GoodData.connect(opts)
-        spec, project_id = GoodData::Command::Project.get_spec_and_project_id('.')
-        project_id = global_options[:project_id] || project_id
-        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?
-        project = GoodData::Command::Project.update(opts.merge(:spec => spec, :project_id => project_id))
-        puts "Migration was done. Project PID is #{project.pid}, URI is #{project.uri}."
-      end
-    end
-
-    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)
-        client = GoodData.connect(opts)
-
-        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 and other problems.'
-    c.command :validate do |show|
-      show.action do |global_options, options, _args|
+    desc 'If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project'
+    command :jack_in do |jack|
+      jack.action do |global_options, options, _args|
         opts = options.merge(global_options)
-        client = GoodData.connect(opts)
-        pp GoodData::Command::Project.validate(global_options[:project_id], opts.merge(client: client))
+        GoodData::Command::Project.jack_in(opts)
       end
     end
   end

data/lib/gooddata/cli/shared.rb

@@ -12,48 +12,50 @@ require_relative '../extensions/extensions'
 require_relative '../exceptions/exceptions'
 require_relative '../helpers/auth_helpers'
 
-include GLI::App
-
-GoodData::CLI.module_eval do
-  program_desc 'GoodData Ruby gem - a wrapper over GoodData API and several useful abstractions to make your everyday usage of GoodData easier.'
-
-  version GoodData::VERSION
-
-  desc 'GoodData user name'
-  default_value nil
-  arg_name 'gooddata-login'
-  flag [:U, :username, :login]
-
-  desc 'GoodData password'
-  default_value nil
-  arg_name 'gooddata-password'
-  flag [:P, :password]
-
-  desc 'Project pid'
-  default_value nil
-  arg_name 'project-id'
-  flag [:p, :project_id]
-
-  desc 'Server'
-  default_value GoodData::Helpers::AuthHelper.read_server
-  arg_name 'server'
-  flag [:s, :server]
-
-  desc 'WEBDAV Server. Used for uploads of files'
-  default_value nil
-  arg_name 'web dav server'
-  flag [:w, :webdav_server]
-
-  desc 'Token for project creation'
-  default_value nil
-  arg_name 'token'
-  flag [:t, :token]
-
-  desc 'Verbose mode'
-  arg_name 'verbose'
-  switch [:v, :verbose]
-
-  desc 'Http logger on stdout'
-  arg_name 'logger'
-  switch [:l, :logger]
+module GoodData
+  module CLI
+    extend GLI::App
+
+    program_desc 'GoodData Ruby gem - a wrapper over GoodData API and several useful abstractions to make your everyday usage of GoodData easier.'
+
+    version GoodData::VERSION
+
+    desc 'GoodData user name'
+    default_value nil
+    arg_name 'gooddata-login'
+    flag [:U, :username, :login]
+
+    desc 'GoodData password'
+    default_value nil
+    arg_name 'gooddata-password'
+    flag [:P, :password]
+
+    desc 'Project pid'
+    default_value nil
+    arg_name 'project-id'
+    flag [:p, :project_id]
+
+    desc 'Server'
+    default_value GoodData::Helpers::AuthHelper.read_server
+    arg_name 'server'
+    flag [:s, :server]
+
+    desc 'WEBDAV Server. Used for uploads of files'
+    default_value nil
+    arg_name 'web dav server'
+    flag [:w, :webdav_server]
+
+    desc 'Token for project creation'
+    default_value nil
+    arg_name 'token'
+    flag [:t, :token]
+
+    desc 'Verbose mode'
+    arg_name 'verbose'
+    switch [:v, :verbose]
+
+    desc 'Http logger on stdout'
+    arg_name 'logger'
+    switch [:l, :logger]
+  end
 end

data/lib/gooddata/commands/auth.rb

@@ -64,6 +64,10 @@ module GoodData
 
         # Ask for credentials and store them
         def store(credentials_file_path = Helpers::AuthHelper.credentials_file)
+          puts 'This will store credntials to GoodData in an enencrypted form to your harddrive to file ~/.gooddata.'
+          overwrite = GoodData::CLI.terminal.ask('Do you want to continue? (y/n)')
+          return if overwrite != 'y'
+
           credentials = ask_for_credentials
 
           ovewrite = if File.exist?(credentials_file_path)

data/lib/gooddata/commands/project.rb

@@ -79,15 +79,7 @@ module GoodData
 
         # Update project
         def update(opts = { client: GoodData.connection })
-          client = opts[:client]
-          fail ArgumentError, 'No :client specified' if client.nil?
-
-          p = opts[:project]
-          fail ArgumentError, 'No :project specified' if p.nil?
-
-          project = GoodData::Project[p, opts]
-          fail ArgumentError, 'Wrong :project specified' if project.nil?
-
+          client, project = GoodData.get_client_and_project(opts)
           GoodData::Model::ProjectCreator.migrate(:spec => opts[:spec], :client => client, :project => project)
         end
 
@@ -113,25 +105,16 @@ module GoodData
 
           spin_session = proc do |goodfile, _blueprint|
             project_id = options[:project_id] || goodfile[:project_id]
-            message = '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"'
-            fail message if project_id.nil? || project_id.empty?
 
             begin
               require 'gooddata'
               client = GoodData.connect(options)
-
-              GoodData.with_project(project_id, :client => client) do |project|
-                fail ArgumentError, 'Wrong project specified' if project.nil?
-
-                puts "Use 'exit' to quit the live session. Use 'q' to jump out of displaying a large output."
-                binding.pry(:quiet => true, # rubocop:disable Lint/Debugger
-                            :prompt => [proc do |_target_self, _nest_level, _pry|
-                              'project_live_session: '
-                            end])
-              end
+              project = client.projects(project_id) if project_id
+              puts "Use 'exit' to quit the live session. Use 'q' to jump out of displaying a large output."
+              binding.pry(:quiet => true, # rubocop:disable Lint/Debugger
+                          :prompt => [proc do |_target_self, _nest_level, _pry|
+                            'project_live_session: '
+                          end])
             rescue GoodData::ProjectNotFound
               puts "Project with id \"#{project_id}\" could not be found. Make sure that the id you provided is correct."
             end