gooddata 0.6.0.pre11 → 0.6.0

data/lib/gooddata/bricks/middleware/logger_middleware.rb

@@ -1,17 +1,17 @@
+# encoding: UTF-8
+
 require 'logger'
 
-require File.join(File.dirname(__FILE__), "base_middleware")
+require_relative 'base_middleware'
 
 module GoodData::Bricks
   class LoggerMiddleware < GoodData::Bricks::Middleware
-
     def call(params)
-      logger = params["GDC_LOGGER"] = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
-      logger.info("Pipeline starts")
+      logger = params['GDC_LOGGER'] = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
+      logger.info('Pipeline starts')
       returning(@app.call(params)) do |result|
-        logger.info("Pipeline ending")
+        logger.info('Pipeline ending')
       end
     end
-
   end
 end

data/lib/gooddata/bricks/middleware/middleware.rb

@@ -1,4 +1,7 @@
+# encoding: UTF-8
+require 'pathname'
+
 base = Pathname(__FILE__).dirname.expand_path
-Dir.glob(base + '*_middleware.*').each do | file |
+Dir.glob("#{base}/*_middleware.rb").each do |file|
   require file
 end

data/lib/gooddata/bricks/middleware/restforce_middleware.rb

@@ -1,48 +1,45 @@
+# encoding: UTF-8
+
 require 'gooddata'
 
-require File.join(File.dirname(__FILE__), "base_middleware")
+require_relative 'base_middleware'
 
 module GoodData::Bricks
   class RestForceMiddleware < GoodData::Bricks::Middleware
-
     def call(params)
-
-      username      = params[:salesforce_username]
-      password      = params[:salesforce_password]
-      token         = params[:salesforce_token]
-      client_id     = params[:salesforce_client_id]
+      username = params[:salesforce_username]
+      password = params[:salesforce_password]
+      token = params[:salesforce_token]
+      client_id = params[:salesforce_client_id]
       client_secret = params[:salesforce_client_secret]
-      oauth_token   = params[:salesforce_oauth_token]
+      oauth_token = params[:salesforce_oauth_token]
       refresh_token = params[:salesforce_refresh_token]
-      host          = params[:salesforce_host]
-
-      credentials = {}
+      host = params[:salesforce_host]
 
       credentials = if (username && password && token)
-        {
-          :username       => username,
-          :password       => password,
-          :security_token => token
-        }
-      elsif (oauth_token && refresh_token)
-        {
-          :oauth_token    => oauth_token,
-          :refresh_token  => refresh_token
-        }
-      end
+                      {
+                        :username => username,
+                        :password => password,
+                        :security_token => token
+                      }
+                    elsif (oauth_token && refresh_token)
+                      {
+                        :oauth_token => oauth_token,
+                        :refresh_token => refresh_token
+                      }
+                    end
 
       client = if credentials
-        credentials.merge!({
-          :client_id      => client_id,
-          :client_secret  => client_secret,
-        })
-        credentials[:host] = host unless host.nil?
-
-        Restforce.log = true if params[:salesforce_client_logger]
-        Restforce.new(credentials)
-      end
+                 credentials.merge!({
+                                      :client_id => client_id,
+                                      :client_secret => client_secret,
+                                    })
+                 credentials[:host] = host unless host.nil?
+
+                 Restforce.log = true if params[:salesforce_client_logger]
+                 Restforce.new(credentials)
+               end
       @app.call(params.merge(:salesforce_client => client))
     end
-
   end
 end

data/lib/gooddata/bricks/middleware/stdout_middleware.rb

@@ -1,16 +1,16 @@
-require File.join(File.dirname(__FILE__), "base_middleware")
+# encoding: UTF-8
+
+require_relative 'base_middleware'
 
 module GoodData::Bricks
   class STDOUTLoggingMiddleware < GoodData::Bricks::Middleware
-
     def call(params)
       logger = Logger.new(STDOUT)
       params[:logger] = logger
-      logger.info("Pipeline starting with STDOUT logger")
+      logger.info('Pipeline starting with STDOUT logger')
       returning(@app.call(params)) do
-        logger.info("Pipeline ending")
+        logger.info('Pipeline ending')
       end
     end
-
   end
 end

data/lib/gooddata/bricks/middleware/twitter_middleware.rb

@@ -1,17 +1,16 @@
+# encoding: UTF-8
+
 # require 'twitter'
 
-require File.join(File.dirname(__FILE__), "base_middleware")
+require_relative 'base_middleware'
 
 module GoodData::Bricks
-  
   class TwitterMiddleware < GoodData::Bricks::Middleware
-
     def call(params)
-    
       client = Twitter::REST::Client.new do |config|
-        config.consumer_key        = params[:twitter_consumer_key]
-        config.consumer_secret     = params[:twitter_consumer_secret]
-        config.access_token        = params[:twitter_access_token]
+        config.consumer_key = params[:twitter_consumer_key]
+        config.consumer_secret = params[:twitter_consumer_secret]
+        config.access_token = params[:twitter_access_token]
         config.access_token_secret = params[:twitter_access_token_secret]
       end
 
@@ -19,6 +18,5 @@ module GoodData::Bricks
         client.update(result)
       end
     end
-
   end
 end

data/lib/gooddata/bricks/utils.rb

@@ -1,12 +1,12 @@
+# encoding: UTF-8
+
 module GoodData::Bricks
   module Utils
-
     def returning(value, &block)
-      fail "Block was not provided" if block.nil? 
+      fail 'Block was not provided' if block.nil?
       return_val = value
       block.call(value)
       return_val
     end
-
   end
 end

data/lib/gooddata/cli/cli.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'gli'
 require 'pp'
 
@@ -7,10 +9,10 @@ module GoodData
     include GLI::App
 
     # Require shared part of GLI::App - flags, meta, etc
-    require File.join(File.dirname(__FILE__), 'shared.rb')
+    require_relative 'shared.rb'
 
     # Require Hooks
-    require File.join(File.dirname(__FILE__), 'hooks.rb')
+    require_relative 'hooks.rb'
 
     GLI::App.commands_from(File.join(File.dirname(__FILE__), 'commands'))
 

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

@@ -1,14 +1,16 @@
+# encoding: UTF-8
+
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/api")
+require_relative '../shared'
+require_relative '../../commands/api'
 
 GoodData::CLI.module_eval do
   desc 'Some basic API stuff directly from CLI'
   arg_name 'info|test|get|delete'
   command :api do |c|
 
-    c.desc "Info about the API version etc"
+    c.desc 'Info about the API version etc'
     c.command :info do |info|
       info.action do |global_options, options, args|
         opts = options.merge(global_options)
@@ -17,7 +19,7 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "GET request on our API"
+    c.desc 'GET request on our API'
     c.command :get do |get|
       get.action do |global_options, options, args|
         opts = options.merge(global_options)

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

@@ -1,12 +1,14 @@
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/auth")
+# encoding: UTF-8
+
+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.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

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

@@ -1,6 +1,6 @@
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
+require_relative "../shared"
 
 GoodData::CLI.module_eval do
   desc 'Interactive session with gooddata sdk loaded'

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

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/process")
+require_relative '../shared'
+require_relative '../../commands/process'
 
 GoodData::CLI.module_eval do
 
@@ -34,7 +36,7 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "Gives you some basic info about the process"
+    c.desc 'Gives you some basic info about the process'
     c.command :get do |get|
       get.action do |global_options, options, args|
         opts = options.merge(global_options)
@@ -43,7 +45,7 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "Deploys provided directory to the server"
+    c.desc 'Deploys provided directory to the server'
     c.command :deploy do |deploy|
       deploy.action do |global_options, options, args|
         opts = options.merge(global_options)

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

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/profile")
+require_relative '../shared'
+require_relative '../../commands/profile'
 
 GoodData::CLI.module_eval do
 
@@ -9,7 +11,7 @@ GoodData::CLI.module_eval do
   arg_name 'show'
   command :profile do |c|
 
-    c.desc "Show your profile"
+    c.desc 'Show your profile'
     c.command :show do |show|
       show.action do |global_options, options, args|
         opts = options.merge(global_options)

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

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/projects")
+require_relative '../shared'
+require_relative '../../commands/projects'
 
 GoodData::CLI.module_eval do
 
@@ -15,11 +17,11 @@ GoodData::CLI.module_eval do
         opts = options.merge(global_options)
         GoodData.connect(opts)
         list = GoodData::Command::Projects.list()
-        puts list.map { |p| [p.uri, p.title].join(",") }
+        puts list.map { |p| [p.uri, p.title].join(',') }
       end
     end
 
-    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.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|
         goodfile_path = GoodData::Helpers.find_goodfile(Pathname('.'))
@@ -36,7 +38,7 @@ GoodData::CLI.module_eval do
               puts "Use 'exit' to quit the live session. Use 'q' to jump out of displaying a large output."
               binding.pry(:quiet => true,
                           :prompt => [proc { |target_self, nest_level, pry|
-                            "project_live_sesion: "
+                            'project_live_sesion: '
                           }])
             end
           rescue GoodData::ProjectNotFound => e
@@ -45,7 +47,7 @@ GoodData::CLI.module_eval do
         end
 
         if goodfile_path
-          goodfile = JSON.parse(File.read(goodfile_path), :symbolize_names => true)
+          goodfile = MultiJson.load(File.read(goodfile_path), :symbolize_keys => true)
           model_key = goodfile[:model]
           blueprint = GoodData::Model::ProjectBlueprint.new(eval(File.read(model_key)).to_hash) if File.exist?(model_key) && !File.directory?(model_key)
           FileUtils::cd(goodfile_path.dirname) do
@@ -57,27 +59,27 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "Create a gooddata project"
+    c.desc 'Create a gooddata project'
     c.command :create do |create|
       create.action do |global_options, options, args|
-        title = ask "Project name"
-        summary = ask("Project summary") { |q| q.default = "" }
-        template = ask("Project template")
-        token = ask("token")
+        title = ask 'Project name'
+        summary = ask('Project summary') { |q| q.default = '' }
+        template = ask('Project template')
+        token = ask('token')
 
         opts = options.merge(global_options)
         GoodData.connect(opts)
         project = GoodData::Command::Projects.create({
-                                                         :title => title,
-                                                         :summary => summary,
-                                                         :template => template,
-                                                         :token => token
+                                                       :title => title,
+                                                       :summary => summary,
+                                                       :template => template,
+                                                       :token => token
                                                      })
         puts "Project '#{project.title}' with id #{project.uri} created successfully!"
       end
     end
 
-    c.desc "Delete a project. Be careful this is impossible to revert"
+    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]
@@ -87,7 +89,7 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "Clones a project. Useful for testing"
+    c.desc 'Clones a project. Useful for testing'
     c.command :clone do |clone|
       clone.desc 'Name of the new project'
       clone.default_value nil
@@ -104,7 +106,7 @@ GoodData::CLI.module_eval do
       end
     end
 
-    c.desc "Shows basic info about a project"
+    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]
@@ -115,24 +117,24 @@ GoodData::CLI.module_eval do
       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.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)
         GoodData.connect(opts)
-        spec, project_id = GoodData::Command::Projects.get_spec_and_project_id(".")
+        spec, project_id = GoodData::Command::Projects.get_spec_and_project_id('.')
         new_project = GoodData::Command::Projects.build(opts.merge(:spec => spec))
         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.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::Projects.get_spec_and_project_id(".")
+        spec, project_id = GoodData::Command::Projects.get_spec_and_project_id('.')
         project = GoodData::Command::Projects.update(opts.merge(:spec => spec, :project_id => global_options[:project_id] || project_id))
         puts "Migration was done. Project PID is #{project.pid}, URI is #{project.uri}."
 

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

@@ -1,9 +1,11 @@
+# encoding: UTF-8
+
 require 'pp'
 
-require File.join(File.dirname(__FILE__), "../shared")
-require File.join(File.dirname(__FILE__), "../../commands/process")
-require File.join(File.dirname(__FILE__), "../../commands/runners")
-require File.join(File.dirname(__FILE__), "../../client")
+require_relative '../shared'
+require_relative '../../commands/process'
+require_relative '../../commands/runners'
+require_relative '../../client'
 
 GoodData::CLI.module_eval do
 
@@ -33,22 +35,22 @@ GoodData::CLI.module_eval do
     c.action do |global_options, options, args|
       verbose = global_options[:verbose]
       options[:expanded_params] = if (options[:params])
-                                    JSON.parse(File.read(options[:params]))
+                                    MultiJson.load(File.read(options[:params]))
                                   else
                                     {}
                                   end
 
-      opts = options.merge(global_options).merge({:type => "RUBY"})
+      opts = options.merge(global_options).merge({:type => 'RUBY'})
       GoodData.connect(opts)
       if options[:remote]
-        fail "You have to specify name of the deploy when deploying remotely" if options[:name].nil? || options[:name].empty?
-        require 'gooddata/commands/process'
+        fail 'You have to specify name of the deploy when deploying remotely' if options[:name].nil? || options[:name].empty?
+        require_relative '../../commands/process'
         GoodData::Command::Process.run(options[:dir], opts)
       else
-        require 'gooddata/commands/runners'
+        require_relative '../../commands/runners'
         GoodData::Command::Runners.run_ruby_locally(options[:dir], opts)
       end
-      puts HighLine::color("Running ruby brick - DONE", HighLine::GREEN) if verbose
+      puts HighLine::color('Running ruby brick - DONE', HighLine::GREEN) if verbose
     end
   end