gooddata 0.6.0.pre2 → 0.6.0.pre3

data/bin/gooddata

@@ -44,6 +44,11 @@ desc 'Verbose mode'
 arg_name 'verbose'
 switch [:v,:verbose]
 
+desc 'Http logger on stdout'
+arg_name 'logger'
+switch [:l,:logger]
+
+
 desc 'Describe list here'
 arg_name 'Describe arguments to list here'
 command :process do |c|
@@ -230,17 +235,22 @@ command :run_ruby do |c|
   
 
   c.action do |global_options, options, args|
-
+    options[:params] = if (options[:params])
+      JSON.parse(File.read(options[:params]), :symbolize_names => true)
+    else
+      {}
+    end
+    
     opts = options.merge(global_options).merge({:project_id => options[:project], "project_id" => options[:project], :type => "RUBY"})
-
     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'
       GoodData::Command::Process.run(options[:dir], opts) do
         puts "would run"
       end
     else
       require 'gooddata/commands/runners'
-      GoodData::Command::Runners.run_ruby(options[:dir], options)
+      GoodData::Command::Runners.run_ruby_locally(options[:dir], opts)
     end
   end
 end
@@ -260,7 +270,7 @@ end
 
 pre do |global,command,options,args|
   require 'logger'
-  GoodData.logger = Logger.new(STDOUT)
+  GoodData.logger = Logger.new(STDOUT) if global[:l]
   username = global[:username]
   password = global[:password]
 

data/gooddata.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.authors = ["Pavel Kolesnikov", "Thomas Watson Steen"]
   s.summary = %q{A convenient Ruby wrapper around the GoodData RESTful API}
   s.date = %q{2012-12-17}
-  s.description = %q{Use the Gooddata::Client class to integrate GoodData into your own application or use the CLI to work with GoodData directly from the command line.}
+  s.description = %q{Use the GoodData::Client class to integrate GoodData into your own application or use the CLI to work with GoodData directly from the command line.}
   s.email = %q{pavel@gooddata.com}
   s.executables = ["gooddata"]
   s.extra_rdoc_files = [
@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.3.7"
   
-  s.add_development_dependency "bundler"
   s.add_development_dependency "thoughtbot-shoulda"
   s.add_development_dependency "pry"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
 
+  s.add_dependency "bundler"
   s.add_dependency "parseconfig"
   s.add_dependency "json_pure"
   s.add_dependency "rest-client"
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency "gli"
   s.add_dependency "pry"
   s.add_dependency "erubis"
+  s.add_dependency "activesupport"
   
 end
 

data/lib/gooddata.rb

@@ -1,4 +1,6 @@
 module GoodData; end
 
+require 'active_support/all'
 require 'gooddata/client'
 require 'gooddata/model'
+require 'gooddata/bricks/brick'

data/lib/gooddata/bricks/brick.rb

@@ -0,0 +1,40 @@
+require 'gooddata/bricks/utils'
+require 'gooddata/bricks/middleware/middleware'
+require 'gooddata/bricks/middleware/bench_middleware'
+require 'gooddata/bricks/middleware/gooddata_middleware'
+require 'gooddata/bricks/middleware/logger_middleware'
+require 'gooddata/bricks/middleware/stdout_middleware'
+
+module GoodData
+  module Bricks
+
+    class Pipeline
+      def self.prepare(pipeline)
+        pipeline.reverse.reduce(nil) {|memo, app| memo.nil? ? app.new : app.new(memo)}
+      end
+    end
+    
+    class Brick
+
+      def log(message)
+        logger = @params[:gdc_logger]
+        logger.info(message) unless logger.nil?
+      end
+
+      def name
+        self.class
+      end
+
+      def version
+        fail "Method version should be reimplemented"
+      end
+
+      def call(params={})
+        @params = params
+        ""
+      end
+
+    end
+    
+  end
+end

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

@@ -0,0 +1,14 @@
+require 'benchmark'
+
+class BenchMiddleware < GoodData::Bricks::Middleware
+
+  def call(params)
+    puts "Starting timer"
+    result = nil
+    report = Benchmark.measure { result = @app.call(params) }
+    puts "Stopping timer"
+    pp report
+    result
+  end
+
+end

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

@@ -0,0 +1,22 @@
+require 'gooddata'
+
+class GoodDataMiddleware < GoodData::Bricks::Middleware
+
+  def call(params)
+    logger = params[:gdc_logger]
+    token_name = :GDC_SST
+    protocol_name = :GDC_PROTOCOL
+    server_name = :GDC_SERVER
+
+    fail "SST (SuperSecureToken) not present in params" if params[token_name].nil?
+    logger.info "Connecting to GD with SST"
+    server = if !params[protocol_name].empty? && !params[server_name].empty?
+      params[protocol_name] + "://" + params[server_name]
+    end
+
+    GoodData.connect_with_sst(params[token_name], {:server => server})
+    GoodData.logger = logger
+    @app.call(params)
+  end
+
+end

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

@@ -0,0 +1,14 @@
+require 'logger'
+
+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")
+
+    returning(@app.call(params)) do |result|
+      logger.info("Pipeline ending")
+    end
+  end
+
+end

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

@@ -0,0 +1,11 @@
+module GoodData::Bricks
+
+  class Middleware
+    include GoodData::Bricks::Utils
+
+    def initialize(app)
+      @app = app
+    end
+    
+  end
+end

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

@@ -0,0 +1,12 @@
+class STDOUTLoggingMiddleware < GoodData::Bricks::Middleware
+
+  def call(params)
+    logger = Logger.new(STDOUT)
+    params[:logger] = logger
+    logger.info("Pipeline starting with STDOUT logger")
+    returning(@app.call(params)) do
+      logger.info("Pipeline ending")
+    end
+  end
+
+end

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

@@ -0,0 +1,19 @@
+require 'twitter'
+
+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.access_token_secret = params[:twitter_access_token_secret]
+    end
+
+    returning(@app.call(params)) do |result|
+      client.update(result)
+    end
+  end
+
+end

data/lib/gooddata/bricks/utils.rb

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

data/lib/gooddata/client.rb

@@ -1,6 +1,5 @@
 require 'gooddata/version'
 require 'gooddata/connection'
-require 'active_support/core_ext/string'
 
 # fastercsv is built in Ruby 1.9
 if RUBY_VERSION < "1.9"
@@ -112,9 +111,7 @@ module GoodData
     # * +options+ - :cookies => you can specify a hash of cookies
     # 
     def create_authenticated_connection(options={})
-      url = options[:server]
-
-      connect("", "", url, options)
+      connect(options)
       server_cookies = options[:cookies]
       connection.merge_cookies!(server_cookies)
       connection.status = :logged_in

data/lib/gooddata/commands/process.rb

@@ -34,7 +34,7 @@ module GoodData::Command
       
 
       type = options[:type] || fail("Type of deployment is not specified")
-      deploy_name = "AAAAA"
+      deploy_name = options[:name]
       verbose = options[:verbose] || false
       project_pid = options[:project_pid]
       puts HighLine::color("Deploying #{dir}", HighLine::BOLD) if verbose
@@ -78,8 +78,8 @@ module GoodData::Command
       if type == :ruby 
         result = GoodData.post(link, {
           :execution => {
-           :graph => dir + "main.rb",
-           :params => {}  
+           :graph => (dir + "main.rb").to_s,
+           :params => options[:params]
           }
         })
         begin
@@ -117,17 +117,17 @@ module GoodData::Command
     def self.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 => "Temporary deploy[#{dir}][#{options[:project_name]}]")) do |deploy_response|
+      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)
+            result = execute_process(deploy_response["process"]["links"]["executions"], dir, options)
           # end
         # end
       end

data/lib/gooddata/commands/runners.rb

@@ -1,33 +1,38 @@
+require 'bundler'
+
 module GoodData::Command
   class Runners
 
-    def self.run_ruby(brick_dir, options={})
+    def self.run_ruby_locally(brick_dir, options={})
       pid = options[:project]
       fail "You have to specify a project ID" if pid.nil?
-      fail "You have to specify directory of the brick ran" if brick_dir.nil?
+      fail "You have to specify directory of the brick run" if brick_dir.nil?
+      fail "You specified file as a birck run directory. You have to specify directory." if File.exist?(brick_dir) && !File.directory?(brick_dir)
 
-      params = if options[:params]
-        JSON.parse(File.read(options[:params]), :symbolize_names => true)
-      else
-        {}
-      end
+      params = options[:params] || {}
 
       GoodData.connection.connect!
       sst = GoodData.connection.cookies[:cookies]["GDCAuthSST"]
-      
+      pwd = Pathname.new(Dir.pwd)
       logger_stream = STDOUT
+      
+      server_uri = URI(options[:server]) unless options[:server].nil?
+      scheme = server_uri.nil? ? "" : server_uri.scheme
+      hostname = server_uri.nil? ? "" : server_uri.host
+
 script_body = <<-script_body
       require 'fileutils'
-      FileUtils::cd(\"#{brick_dir}\") do\
+      FileUtils::cd(\"#{pwd+brick_dir}\") do\
         require 'bundler/setup'
         eval(File.read(\"main.rb\")).call({
-          :gdc_sst => \"#{sst}\",
-          :gdc_project => \"#{pid}\"
+          :GDC_SST => \"#{sst}\",
+          :GDC_PROJECT_ID => \"#{pid}\",
+          :GDC_PROTOCOL => \"#{scheme}\",
+          :GDC_SERVER => \"#{hostname}\"
         }.merge(#{params}))
       end
 script_body
 
-
       Bundler.with_clean_env do
         system("ruby", "-e", script_body)  
       end

data/lib/gooddata/models/dashboard.rb

@@ -52,7 +52,6 @@ module GoodData
       end
 
       def create(options={})
-        binding.pry
         stuff = {
            "projectDashboard" => {
               "content" => {

data/lib/gooddata/models/process.rb

@@ -67,7 +67,6 @@ module GoodData
           end
         end
         puts HighLine::color("Deploy DONE #{dir}", HighLine::BOLD) if verbose
-        binding.pry
         res
       end
     end

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.6.0.pre2"
+  VERSION = "0.6.0.pre3"
 end

data/lib/templates/bricks/brick.rb.erb

@@ -1,4 +1,4 @@
-class MyBrick < Gooddata::Bricks::Brick
+class MyBrick < GoodData::Bricks::Brick
 
   def call(params)
     # do something here

data/lib/templates/bricks/main.rb.erb

@@ -1,4 +1,4 @@
 require 'gooddata/bricks'
 require './mybrick'
 
-Gooddata::Bricks::Pipeline.prepare([LoggerMiddleware, BenchMiddleware, GoodDataMiddleware, MyBrick])
+GoodData::Bricks::Pipeline.prepare([LoggerMiddleware, BenchMiddleware, GoodDataMiddleware, MyBrick])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre2
+  version: 0.6.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ cert_chain: []
 date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: thoughtbot-shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -29,7 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thoughtbot-shoulda
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -61,7 +61,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -77,14 +77,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -236,7 +236,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Use the Gooddata::Client class to integrate GoodData into your own application
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Use the GoodData::Client class to integrate GoodData into your own application
   or use the CLI to work with GoodData directly from the command line.
 email: pavel@gooddata.com
 executables:
@@ -258,6 +274,14 @@ files:
 - examples.rb
 - gooddata.gemspec
 - lib/gooddata.rb
+- lib/gooddata/bricks/brick.rb
+- lib/gooddata/bricks/middleware/bench_middleware.rb
+- lib/gooddata/bricks/middleware/gooddata_middleware.rb
+- lib/gooddata/bricks/middleware/logger_middleware.rb
+- lib/gooddata/bricks/middleware/middleware.rb
+- lib/gooddata/bricks/middleware/stdout_middleware.rb
+- lib/gooddata/bricks/middleware/twitter_middleware.rb
+- lib/gooddata/bricks/utils.rb
 - lib/gooddata/client.rb
 - lib/gooddata/commands/api.rb
 - lib/gooddata/commands/auth.rb