pagoda 0.5.0 → 0.6.0

data/.gitignore

@@ -1 +1,2 @@
 pagoda-*.*.*.gem
+pkg

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    pagoda (0.1.15)
+    pagoda (0.6.0)
       gli
       pagoda-client
       pagoda-tunnel
+      rest-client
+      socketio-client
 
 GEM
   remote: http://rubygems.org/
   specs:
     coderay (0.9.8)
     diff-lcs (1.1.3)
-    gli (1.3.5)
-    json_pure (1.6.1)
+    gli (2.0.0)
+    json_pure (1.7.4)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
-    mime-types (1.17.2)
-    pagoda-client (0.1.2)
+    mime-types (1.19)
+    pagoda-client (0.1.8)
       json_pure
       rest-client
-    pagoda-tunnel (0.1.2)
+    pagoda-tunnel (0.1.3)
       rest-client
     pry (0.9.7.3)
       coderay (~> 0.9.8)
@@ -40,6 +42,8 @@ GEM
       sexp_processor (~> 3.0)
     sexp_processor (3.0.7)
     slop (2.1.0)
+    socketio-client (0.0.3)
+      rest-client
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,8 +1,20 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake/packagetask'
+
 
 desc "Run all specs"
 RSpec::Core::RakeTask.new('spec') do |t|
   t.rspec_opts = ['--colour --format documentation']
+end
+
+desc "Package task"
+Rake::PackageTask.new("pagoda", Pagoda::CLI::VERSION ) do |p|
+  p.need_tar_gz = true
+  p.package_files.include("./**/**/**/**")
+end
+
+task :push do
+  sh "scp pkg/pagoda-#{Pagoda::CLI::VERSION}.tar.gz getdeb@pagodabox.com:shared/pagoda/"
 end

data/bin/pagoda

@@ -5,10 +5,10 @@ require 'rest_client'
 require 'gli'
 
 require 'pagoda/cli/version'
-require 'pagoda/cli/override'
+# require 'pagoda/cli/override'
 
 # command = ARGV.shift.strip rescue 'help'
-include GLI
+include GLI::App
 config_file '.pagodarc'
 
 program_desc 'Command line client for Pagoda Box'
@@ -32,7 +32,7 @@ switch [:h, :help]
 
 require 'pagoda/cli'
 
-GLI::DefaultHelpCommand.skips_pre = true
+# GLI::DefaultHelpCommand.skips_pre = true
 
 pre do |global,command,options,args|
   # Pre logic here
@@ -102,4 +102,4 @@ on_error do |exception|
   # false
 end
 
-exit GLI.run(ARGV)
+exit run(ARGV)

data/lib/pagoda/cli/commands/log.rb

@@ -0,0 +1,17 @@
+desc 'Real time log to your pagodabox application'
+arg_name 'Component name'
+command :log do |c|
+
+  c.desc 'Component name you want to connect to'
+  c.arg_name 'COMPONENT_NAME'
+  c.flag [:c, :component]
+
+  c.desc 'App name'
+  c.arg_name 'APP_NAME'
+  c.flag [:a, :app]
+
+  c.action do |global_options,options,args|
+    require 'pagoda/cli/helpers/log'
+    Pagoda::Command::Log.new(global_options,options,args).run
+  end
+end

data/lib/pagoda/cli/commands.rb

@@ -1,11 +1,13 @@
+# Dir["pagoda/cli/commands/*.rb"].each {|file| require file } <+ magic stopped working :(
 require 'pagoda/cli/commands/clone'
 require 'pagoda/cli/commands/create'
 require 'pagoda/cli/commands/deploy'
 require 'pagoda/cli/commands/destroy'
 require 'pagoda/cli/commands/info'
 require 'pagoda/cli/commands/init'
-require 'pagoda/cli/commands/ssh_key'
 require 'pagoda/cli/commands/list'
+require 'pagoda/cli/commands/log'
 require 'pagoda/cli/commands/rename'
 require 'pagoda/cli/commands/rollback'
+require 'pagoda/cli/commands/ssh_key'
 require 'pagoda/cli/commands/tunnel'

data/lib/pagoda/cli/helpers/log.rb

@@ -0,0 +1,110 @@
+require 'socketIO'
+
+module Pagoda::Command
+  class Log < Base
+
+    COLORS = [
+      'light_red',
+      'light_green',
+      'light_yellow',
+      'light_blue',
+      'light_magenta',
+      'light_cyan',
+      'white',
+      'red',
+      'yellow',
+      'blue',
+      'magenta',
+      'cyan',
+      'green'
+      ]
+
+    def run
+      user_input = options[:component] || args.first
+
+      if user_input =~ /^(web\d*)|(db\d*)|(cache\d*)|(worker\d*)$/
+        comps = user_input
+      else
+        comps = nil
+      end
+
+
+      auth_hash = {user: user, pass: password, app: app}
+      auth_hash['comps'] = [comps] unless comps == nil
+      message_block = ->(hash) { colorize hash[0]['message'], hash[0]['name'] }
+      error_block = ->(hash) { error hash[0]['message'] }
+
+      @client = SocketIO.connect("http://logvac.pagodabox.com", sync: true) do
+
+        before_start do
+          on_event('auth_challenge') do
+            emit('authenticate', auth_hash)
+          end
+
+          on_event('authenticated') do
+            puts "Successfully Authenticated"
+          end
+
+          on_event('error', &error_block)
+
+          on_event('subscribed') do |hash|
+            if hash[0]['success']
+              puts "successfully subscribed to #{hash[0]['comp']}"
+            else
+              puts "failed to subscribe to #{hash[0]['comp']}"
+            end
+          end
+
+          on_event('unsubscribed') do |hash|
+            puts "#{hash[0]['success'] ? 'successfully unsubscribed from' : 'failed to unsubscribe from' } #{hash[0]['comp']}"
+          end
+
+          on_event('log', &message_block)
+
+          on_disconnect do
+            puts "Disconnected"
+            exit 0
+          end
+
+        end
+
+      end
+
+      [:INT, :TERM].each do |sig|
+        Signal.trap(sig) do
+          @client.disconnect
+          puts "Log Closed."
+          puts "-----------------------------------------------"
+          puts
+          exit
+        end
+      end
+
+      loop { sleep 1000 }
+
+    end
+
+    def colorize message, name
+      @hash ||= {}
+      if color = @hash[name]
+        puts message.send(color)
+      else
+        puts message.send(@hash[name] = next_color)
+        # retry  
+      end
+    end
+
+    def next_color
+      COLORS[@hash.length % COLORS.length]
+    end
+
+    def output_error
+      errors = []
+      errors << "Input unrecoginized"
+      errors << "try 'pagoda -a <appname> log <component>'"
+      errors << "ie. 'pagoda -a app log db1'"
+      error errors
+    end
+
+  end
+end

data/lib/pagoda/cli/helpers/tunnel.rb

@@ -15,12 +15,10 @@ module Pagoda::Command
           component = client.component_info(app, user_input)
         end
       rescue
-        errors = []
-        errors << "Input unrecoginized"
-        errors << "try 'pagoda -a <appname> tunnel <component>'"
-        errors << "ie. 'pagoda -a app tunnel db1'"
-        error errors
+        output_error
       end
+      output_error unless component
+      puts component
       if component[:tunnelable]
         type = component[:_type]
         component_id = component[:_id]
@@ -32,5 +30,13 @@ module Pagoda::Command
 
     end
 
+    def output_error
+      errors = []
+      errors << "Input unrecoginized"
+      errors << "try 'pagoda -a <appname> tunnel <component>'"
+      errors << "ie. 'pagoda -a app tunnel db1'"
+      error errors
+    end
+
   end
 end

data/lib/pagoda/cli/override.rb

@@ -7,17 +7,17 @@ unless Object.respond_to? :tap
   end
 end
 
-module GLI
-  def command(*names, &block)
-    command = Command.new([names].flatten,@@next_desc,@@next_arg_name,@@next_long_desc,@@skips_pre,@@skips_post)
-    commands[command.name] = command
-    command.instance_eval(&block)
-    # yield command
-    command.tap do |c|
-      c.desc "Help"
-      c.switch [:h, :help]
-    end
-    clear_nexts
-  end
+# module GLI
+#   def command(*names, &block)
+#     command = Command.new([names].flatten,@@next_desc,@@next_arg_name,@@next_long_desc,@@skips_pre,@@skips_post)
+#     commands[command.name] = command
+#     command.instance_eval(&block)
+#     # yield command
+#     command.tap do |c|
+#       c.desc "Help"
+#       c.switch [:h, :help]
+#     end
+#     clear_nexts
+#   end
 
-end
+# end

data/lib/pagoda/cli/version.rb

@@ -1,5 +1,5 @@
 module Pagoda
   module CLI
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/pagoda-cli.rb

@@ -1 +1,2 @@
+puts 'pagoda-cli'
 require 'pagoda/cli'

data/pagoda.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
 
+  gem.add_dependency 'socketio-client'
   gem.add_dependency "pagoda-client"
   gem.add_dependency "pagoda-tunnel"
   gem.add_dependency "rest-client"
-  gem.add_dependency "gli"
+  gem.add_dependency "gli", '~> 2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagoda
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154455140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154455140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2154454340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154454340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: socketio-client
+  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'
 - !ruby/object:Gem::Dependency
   name: pagoda-client
-  requirement: &2154453660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154453660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pagoda-tunnel
-  requirement: &2154453240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154453240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154452800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +101,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154452800
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &2154452320 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154452320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Pagoda Box User facing interface to improve workflow with Pagoda Box
 email:
 - lyon@pagodabox.com
@@ -102,6 +148,7 @@ files:
 - lib/pagoda/cli/commands/info.rb
 - lib/pagoda/cli/commands/init.rb
 - lib/pagoda/cli/commands/list.rb
+- lib/pagoda/cli/commands/log.rb
 - lib/pagoda/cli/commands/rename.rb
 - lib/pagoda/cli/commands/rollback.rb
 - lib/pagoda/cli/commands/ssh_key.rb
@@ -111,22 +158,13 @@ files:
 - lib/pagoda/cli/helpers/app.rb
 - lib/pagoda/cli/helpers/base.rb
 - lib/pagoda/cli/helpers/key.rb
+- lib/pagoda/cli/helpers/log.rb
 - lib/pagoda/cli/helpers/tunnel.rb
 - lib/pagoda/cli/override.rb
 - lib/pagoda/cli/version.rb
+- newpagoda-0.5.0.gem
 - pagoda.gemspec
 - pagoda.rdoc
-- pkg/newpagoda-0.1.10.gem
-- pkg/newpagoda-0.1.11.gem
-- pkg/newpagoda-0.1.12.gem
-- pkg/newpagoda-0.1.13.gem
-- pkg/newpagoda-0.1.15.gem
-- pkg/newpagoda-0.1.4.gem
-- pkg/newpagoda-0.1.6.gem
-- pkg/newpagoda-0.1.7.gem
-- pkg/newpagoda-0.1.8.gem
-- pkg/newpagoda-0.1.9.gem
-- pkg/newpagoda-0.5.0.gem
 - spec/lib/helper_spec.rb
 - spec/lib/helpers/app_spec.rb
 - spec/lib/helpers/base_spec.rb
@@ -153,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pagoda Box CLI