pagoda 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce96edf2702261d983099dedcc4a534dc5248433
-  data.tar.gz: c11dfac206e06cbc565c26017329620713f24aaf
+  metadata.gz: 3b82c9c493530aa271e9b6604318a325df7e6973
+  data.tar.gz: 82964c4005d415d3f9b851a8cb70f6ecece97ba1
 SHA512:
-  metadata.gz: 45bf008cd55bc27e7ddb2cb85ca21a5fdf92841b2538b87be95207735226b7a0bca6842151b5828a9c0c4bf2d208ddda483b316367cf61a6078ad0265f0cfddc
-  data.tar.gz: 00b531a63c6a730781ccfacab167c13430e3b03afbd45934d6bab395ff5c82c0cba9416fa4709d59317428978495e7f0ec807fd8c4d19496c45748480ba21612
+  metadata.gz: e7c6cc8f94c91041968eb5b252fa5caaa3008eff4267a86805dff102c9fae9a8b43b65c72090f36977d58b357a1ff49914ebd8553e469e4c2d82d72d924df772
+  data.tar.gz: 689c2cea316a59e44ee17e3f22e1ac0eb0f89a3f2df4efa41f6499e8cf08abe8e90920af3bb6bd9a21ea639ae8e6e57a8f3c9b34d9a2f79b7dad5685c514e008

data/Gemfile.lock

@@ -1,29 +1,26 @@
 PATH
   remote: .
   specs:
-    pagoda (0.7.0)
-      eventmachine
-      faye-websocket
+    pagoda (0.7.8)
       gli (~> 2.0.0)
-      msgpack
+      highline
       pagoda-client
       pagoda-tunnel
       rest-client
+      websocket-client-simple
 
 GEM
   remote: http://rubygems.org/
   specs:
     coderay (0.9.8)
     diff-lcs (1.1.3)
-    eventmachine (1.0.3)
-    faye-websocket (0.4.6)
-      eventmachine (>= 0.12.0)
+    event_emitter (0.2.5)
     gli (2.0.0)
+    highline (1.6.19)
     json_pure (1.8.0)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
     mime-types (1.23)
-    msgpack (0.5.4)
     pagoda-client (0.2.2)
       json_pure
       rest-client
@@ -48,6 +45,10 @@ GEM
       sexp_processor (~> 3.0)
     sexp_processor (3.0.7)
     slop (2.1.0)
+    websocket (1.0.7)
+    websocket-client-simple (0.0.5)
+      event_emitter
+      websocket
 
 PLATFORMS
   ruby

data/lib/pagoda/cli/helpers.rb

@@ -41,16 +41,17 @@ module Pagoda
 
     def error(msg, exit=true, level=1)
       STDERR.puts
-      begin
-        case msg
-        when Array
-          say("<%= color('#{msg.join("\n")}', :red)%>")
-        when String
-          say("<%= color(msg, :red)%>")
-        end
-      rescue 
-        puts msg
-      end
+      STDERR.puts msg
+      # begin
+      #   case msg
+      #   when Array
+      #     say("<%= color('#{msg.join("\n")}', :red)%>")
+      #   when String
+      #     say("<%= color(msg, :red)%>")
+      #   end
+      # rescue 
+      #   puts msg
+      # end
       STDERR.puts
       exit 1 if exit
     end

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

@@ -67,7 +67,7 @@ module Pagoda
         git "config --add pagoda.id #{id}"
         Dir.chdir("..")
         display
-        display "+> Repo has been added. Navigate to folder #{my_app}."
+        display "+ Repo has been added. Navigate to folder #{my_app}."
       rescue
         error "We were not able to access that app"
       end
@@ -87,7 +87,7 @@ module Pagoda
           display
           display "----------------------------------------------------"
           display
-          display "+> Use 'git push #{d_remote} --all' to push your code live"
+          display "+ Use 'git push #{d_remote} --all' to push your code live"
         else
           error "App name (#{name}) is already taken"
         end
@@ -102,7 +102,7 @@ module Pagoda
           rescue RestClient::Found => e
             # do nothing because we found it HURRAY!
           end
-          display "+> deploying current branch and commit...", true
+          display "+ deploying current branch and commit...", true
           loop_transaction
         else
           error "Your app is currently in transaction, Please try again later."          
@@ -112,7 +112,7 @@ module Pagoda
       def rollback
         display
         client.app_rollback(app)
-        display "+> undo..."
+        display "+ undo..."
         loop_transaction
         display
       end
@@ -122,16 +122,16 @@ module Pagoda
         my_app = app
         dname = display_name(my_app) # Make the app name look better
         if options[:force]
-          display "+> Destroying #{dname}"
+          display "+ Destroying #{dname}"
           client.app_destroy(my_app)
-          display "+> #{dname} has been successfully destroyed. RIP #{dname}."
+          display "+ #{dname} has been successfully destroyed. RIP #{dname}."
           remove_app(my_app)
         else
           if confirm ["Are you totally completely sure you want to delete #{dname} forever and ever?", "THIS CANNOT BE UNDONE! "]
             display
-            display "+> Destroying #{dname}"
+            display "+ Destroying #{dname}"
             client.app_destroy(my_app)
-            display "+> #{dname} has been successfully destroyed. RIP #{dname}."
+            display "+ #{dname} has been successfully destroyed. RIP #{dname}."
             remove_app(my_app)
           end
         end

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

@@ -6,7 +6,7 @@ module Pagoda
 
       def generate_key_and_push
         display 
-        display "+> Generating a ssh key pair"
+        display "+ Generating a ssh key pair"
         display 
         if running_on_windows?
           display "It appears you are running on windows"
@@ -54,8 +54,8 @@ module Pagoda
         key = File.read(file).strip
         if key =~ /^ssh-(?:dss|rsa) [A-Za-z0-9+\/]+/
           client.user_add_key(key)
-          display "+> Pushing ssh key to Pagoda Box"
-          display "+> done"
+          display "+ Pushing ssh key to Pagoda Box"
+          display "+ done"
         else
           error "that key is not the correct format"
         end

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

@@ -108,7 +108,7 @@ module Pagoda::Command
     def output_error
       errors = []
       errors << "Input unrecoginized"
-      errors << "try 'pagoda -a <appname> log <component>'"
+      errors << "try 'pagoda -a [appname] log [component]'"
       errors << "ie. 'pagoda -a app log db1'"
       error errors
     end

data/lib/pagoda/cli/version.rb

@@ -1,5 +1,5 @@
 module Pagoda
   module CLI
-    VERSION = "0.7.7"
+    VERSION = "0.7.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagoda
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Lyon Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec