gooddata 0.5.16 → 0.6.0.pre2

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 
+# gem 'gooddata-bricks-poc', :path => "../gooddata-bricks"
+gemspec

data/bin/gooddata

@@ -1,13 +1,296 @@
 #!/usr/bin/env ruby
+require 'gli'
+require 'gooddata'
+require 'highline/import'
+require 'gooddata/commands/projects'
 
-require 'logger'
+include GLI::App
 
-require 'gooddata'
-require 'gooddata/command'
+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]
+
+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 nil
+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 'Describe list here'
+arg_name 'Describe arguments to list here'
+command :process do |c|
+
+  c.desc 'Use when you need to redeploy a process'
+  c.default_value nil
+  c.flag :process_id
+
+  c.desc 'Specify directory for deployment'
+  c.default_value nil
+  c.flag :dir
+
+  c.action do |global_options,options,args|
+    require 'gooddata/commands/process'
+    options = options.merge(global_options)
+
+    case args.first
+    when "list"
+      pp GoodData::Command::Process.list(options)
+    when "get"
+      pp GoodData::Command::Process.get(options)
+    when "deploy"
+      GoodData::Command::Process.deploy_graph(options[:dir], options)
+    end
+  end
+end
+
+desc 'Some basic API stuff directly from CLI'
+arg_name 'info|test|get|delete'
+command :api do |c|
+
+  c.action do |global_options,options,args|
+    require 'gooddata/commands/api'
+    options = options.merge(global_options)
+
+    case args.first
+    when "list", "index", "info"
+      pp GoodData::Command::Api.info
+    when "get"
+      pp GoodData::Command::Api.get(args[1])
+    when "deploy"
+      GoodData::Command::Api.deploy_graph(options[:dir], options)
+    end
+  end
+end
+
+
+desc 'Describe add here'
+arg_name 'show'
+command :profile do |c|
+  c.action do |global_options, options, args|
+    require 'gooddata/commands/profile'
+    
+    case args.first
+    when "show"
+      pp GoodData::Command::Profile.show()
+    else
+      raise "command provided not right"
+    end
+  end
+end
+
+desc 'Scaffold things'
+arg_name 'show'
+command :scaffold do |c|
+  c.action do |global_options, options, args|
+    require 'gooddata/commands/scaffold'
+    case args.first
+    when "brick"
+      pp GoodData::Command::Scaffold.brick(args[1])
+    else
+      raise "command provided not right"
+    end
+  end
+end
+
+desc 'Manage your projects'
+arg_name 'project_command'
+command :project do |c|
+
+  c.command :list do |list|
+    list.action do |global_options,options,args|
+      list = GoodData::Command::Projects.list()
+      puts list.map {|p| [p.uri, p.title].join(",")}
+    end
+  end
+
+  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")
+      
+      project = GoodData::Command::Projects.create({
+        :title => title,
+        :summary => summary,
+        :template => template,
+        :token => token
+      })
+      puts "Project '#{project.title}' with id #{project.uri} created successfully!"
+    end
+  end
+
+  c.command :delete do |delete|
+    delete.action do |global_options,options,args|
+      id = global_options[:project_id]
+      GoodData::Command::Projects.delete(id)
+    end
+  end
+
+  c.command :clone do |clone|
+    clone.desc 'Name of the new project'
+    clone.default_value nil
+    clone.arg_name 'cloned_project_name'
+    clone.flag [:n, :name]
+
+    clone.desc 'Token of the new project'
+    clone.default_value nil
+    clone.arg_name 'token'
+    clone.flag [:t, :token]
+
+    clone.action do |global_options,options,args|
+      id = global_options[:project_id]
+      name = options[:name]
+      token = options[:token]
+      GoodData::Command::Projects.clone(id, :name => name, :token => token)
+    end
+  end
+
+  c.command :show do |show|
+    show.action do |global_options,options,args|
+      id = global_options[:project_id]
+      p = GoodData::Command::Projects.show(id)
+      pp p.data
+    end
+  end
+
+  c.command :build do |show|
+    show.action do |global_options,options,args|
+      spec_path = args.first || fail("You need to specify the path of the build spec")
+      opts = options.merge(global_options)
+      spec_path = Pathname.new(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
+      new_project = GoodData::Model::ProjectCreator.migrate(opts.merge(:spec => spec))
+      puts "Migration was done. New project PID is #{new_project.uri}."
+    end
+  end
+
+end
+
+desc 'Run bricks locally'
+# arg_name 'show'
+command :run_ruby do |c|
+
+  c.desc 'Directory of the ruby brick'
+  c.default_value nil
+  c.flag [:d, :dir]
+
+  c.desc 'Project id for which you would like to run the script'
+  c.default_value nil
+  c.flag [:p, :project, :project_id, :project_pid]
+
+  c.desc 'Log file. If empty STDOUT will be used instead'
+  c.default_value nil
+  c.flag [:l, :logger]
+
+  c.desc 'Params file path. Inside should be hash of key values'
+  c.default_value nil
+  c.flag [:params]
+
+  c.desc 'Run on remote machine'
+  c.switch [:r, :remote]
+
+  c.desc 'Name of the deployed process'
+  c.default_value nil
+  c.flag [:n, :name]
+  
+
+  c.action do |global_options, options, args|
+
+    opts = options.merge(global_options).merge({:project_id => options[:project], "project_id" => options[:project], :type => "RUBY"})
+
+    if options[:remote]
+      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)
+    end
+  end
+end
+
+desc 'Manage your projects'
+arg_name 'project_command'
+command :project do |c|
+
+  c.command :list do |list|
+    list.action do |global_options,options,args|
+      list = GoodData::Command::Projects.list()
+      puts list.map {|p| [p.uri, p.title].join(",")}
+    end
+  end
+
+end
+
+pre do |global,command,options,args|
+  require 'logger'
+  GoodData.logger = Logger.new(STDOUT)
+  username = global[:username]
+  password = global[:password]
+
+  GoodData.connect(global.merge(options).merge({
+    :login => username,
+    :password => password,
+    :server => global[:server]
+  }))
+                    
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
 
-args = ARGV.dup
-ARGV.clear
-command = args.shift.strip rescue 'help'
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  # binding.pry
+  pp exception.backtrace
+  pp exception
+  true
+end
 
-GoodData.logger = Logger.new(STDOUT) if ENV['DEBUG']
-GoodData::Command.run command, args
+exit run(ARGV)

data/gooddata.gemspec

@@ -2,8 +2,8 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib/gooddata", __FILE__)
-require "version"
+$:.push File.expand_path("../lib/", __FILE__)
+require "gooddata/version"
 
 Gem::Specification.new do |s|
   s.name = %q{gooddata}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.email = %q{pavel@gooddata.com}
-  s.executables = ["igd.rb", "gooddata"]
+  s.executables = ["gooddata"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -25,12 +25,21 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.3.7"
   
-  s.add_development_dependency "bundler", "~> 1.3"
+  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 "parseconfig"
   s.add_dependency "json_pure"
   s.add_dependency "rest-client"
   s.add_dependency "json"
-  s.add_dependency "rubyzip", "< 1.0.0"
+  s.add_dependency "rubyzip"
+  s.add_dependency "highline"
+  s.add_dependency "gli"
+  s.add_dependency "pry"
+  s.add_dependency "erubis"
+  
 end
 

data/lib/gooddata/client.rb

@@ -1,5 +1,6 @@
 require 'gooddata/version'
 require 'gooddata/connection'
+require 'active_support/core_ext/string'
 
 # fastercsv is built in Ruby 1.9
 if RUBY_VERSION < "1.9"
@@ -84,8 +85,14 @@ module GoodData
     # * +user+ - A GoodData username
     # * +password+ - A GoodData password
     #
-    def connect(user, password, url = nil, options={})
-      threaded[:connection] = Connection.new user, password, url, options
+    def connect(options=nil, second_options=nil, third_options={})
+      if options.is_a? Hash
+        threaded[:connection] = Connection.new(options[:login], options[:password], options)
+        GoodData.project = options[:project] if options[:project]
+      elsif options.is_a?(String) && second_options.is_a?(String)
+        threaded[:connection] = Connection.new(options, second_options, third_options)
+      end
+      
     end
 
     # Hepler for starting with SST easier
@@ -114,6 +121,25 @@ module GoodData
       connection
     end
 
+    def with_project(project, &bl)
+      old_project = GoodData.project
+      begin
+        GoodData.use(project)
+        server_url = case GoodData.project.data["content"]["cluster"]
+        when "na1"
+          "https://na1.gooddata.com"
+        else
+          "https://secure.gooddata.com"
+        end
+        connection.url = server_url
+        bl.call(project)
+      rescue Exception => e
+        fail e
+      ensure
+        GoodData.project = old_project
+      end
+    end
+
     # Returns the active GoodData connection earlier initialized via
     # GoodData.connect call
     #
@@ -140,6 +166,8 @@ module GoodData
     def project=(project)
       if project.is_a? Project
         threaded[:project] = project
+      elsif project.nil?
+        threaded[:project] = nil
       else
         threaded[:project] = Project[project]
       end
@@ -214,13 +242,14 @@ module GoodData
       connection.delete path, options
     end
 
-    def poll(result, key)
+    def poll(result, key, options={})
+      sleep_interval = options[:sleep_interval] || 10
       link = result[key]["links"]["poll"]
       response = GoodData.get(link, :process => false)
       while response.code != 204
-        sleep 5
+        sleep sleep_interval
         GoodData.connection.retryable(:tries => 3, :on => RestClient::InternalServerError) do
-          sleep 5
+          sleep sleep_interval
           response = GoodData.get(link, :process => false)
         end
       end

data/lib/gooddata/commands/api.rb

@@ -1,37 +1,34 @@
 module GoodData::Command
-  class Api < Base
-    def info
-      json = gooddata.release_info
-      puts "GoodData API"
-      puts "  Version: #{json['releaseName']}"
-      puts "  Released: #{json['releaseDate']}"
-      puts "  For more info see #{json['releaseNotesUri']}"
-    end
-    alias :index :info
+  class Api
+    class << self
+      def info
+        json = {}
+        puts "GoodData API"
+        puts "  Version: #{json['releaseName']}"
+        puts "  Released: #{json['releaseDate']}"
+        puts "  For more info see #{json['releaseNotesUri']}"
+      end
+      alias :index :info
 
-    def test
-      connect
-      if GoodData.test_login
-        puts "Succesfully logged in as #{GoodData.profile.user}"
-      else
-        puts "Unable to log in to GoodData server!"
+      def test
+        if GoodData.test_login
+          puts "Succesfully logged in as #{GoodData.profile.user}"
+        else
+          puts "Unable to log in to GoodData server!"
+        end
       end
-    end
 
-    def get
-      path = args.shift rescue nil
-      raise(CommandFailed, "Specify the path you want to GET.") if path.nil?
-      connect
-      result = GoodData.get path
-      jj result rescue puts result
-    end
+      def get(path)
+        raise(CommandFailed, "Specify the path you want to GET.") if path.nil?
+        result = GoodData.get path
+        result rescue puts result
+      end
 
-    def delete
-      path = args.shift rescue nil
-      raise(CommandFailed, "Specify the path you want to DELETE.") if path.nil?
-      connect
-      result = GoodData.delete path
-      jj result rescue puts result
+      def delete(path)
+        raise(CommandFailed, "Specify the path you want to DELETE.") if path.nil?
+        result = GoodData.delete path
+        result rescue puts result
+      end
     end
   end
-end
+end