shelly 0.1.8 → 0.1.9

data/lib/shelly/cli/backup.rb

@@ -84,7 +84,7 @@ module Shelly
         ask_to_restore_database
         app.restore_backup(filename)
         say_new_line
-        say "Restore has been scheduled. Wait a few minutes till database is restored."
+        say "Restore has been scheduled. Wait a few minutes till database is restored.", :green
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud

data/lib/shelly/cli/deploys.rb

@@ -53,7 +53,7 @@ module Shelly
         when :cloud
           say_error "You have no access to '#{app.code_name}' cloud defined in Cloudfile"
         when :log
-          say_error "Log not found, list all deploy logs using  `shelly deploys list --cloud=#{app.code_name}`"
+          say_error "Log not found, list all deploy logs using `shelly deploys list --cloud=#{app.code_name}`"
         else raise
         end
       end
@@ -62,7 +62,7 @@ module Shelly
         def specify_log(log)
           unless log
             say_error "Specify log by passing date value or to see last log use:", :with_exit => false
-            say "  shelly deploys show last"
+            say "`shelly deploys show last`"
             exit 1
           end
         end

data/lib/shelly/cli/main.rb

@@ -39,8 +39,8 @@ module Shelly
           say_error "No such file or directory - #{user.ssh_key_path}", :with_exit => false
           say_error "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`", :with_exit => false
         end
-        say "Successfully registered!"
-        say "Check you mailbox for email address confirmation"
+        say "Successfully registered!", :green
+        say "Check you mailbox for email address confirmation", :green
       rescue Client::ValidationException => e
         e.each_error { |error| say_error "#{error}", :with_exit => false }
         exit 1
@@ -53,7 +53,7 @@ module Shelly
         user.email = email || ask_for_email
         user.password = ask_for_password(:with_confirmation => false)
         user.login
-        say "Login successful"
+        say "Login successful", :green
         user.upload_ssh_key
         say "Uploading your public SSH key"
         list
@@ -183,7 +183,7 @@ module Shelly
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
           say_error "Push source code using:", :with_exit => false
-          say       "  git push #{app} master"
+          say       "`git push #{app} master`"
         when "deploy_failed", "configuration_failed"
           say_error "Not starting: deployment failed", :with_exit => false
           say_error "Support has been notified", :with_exit => false

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/thor/thor.rb

@@ -32,7 +32,7 @@ class Thor
     # We overwrite this method so namespace is show
     # shelly *backup* restore FILENAME
     def handle_argument_error(task, error)
-      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task, nil, self != 'Shelly::CLI::Main').inspect}."
+      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task, nil, self.to_s != 'Shelly::CLI::Main').inspect}."
     end
   end
 end

data/spec/shelly/cli/backup_spec.rb

@@ -186,7 +186,7 @@ describe Shelly::CLI::Backup do
       $stdout.should_receive(:puts).with("\n")
       @client.stub(:restore_backup).with("todo-list-test","better.tar.gz")
       $stdout.should_receive(:puts).with("\n")
-      $stdout.should_receive(:puts).with("Restore has been scheduled. Wait a few minutes till database is restored.")
+      $stdout.should_receive(:puts).with(green "Restore has been scheduled. Wait a few minutes till database is restored.")
 
       fake_stdin(["yes"]) do
         invoke(@backup, :restore, "better.tar.gz")

data/spec/shelly/cli/deploys_spec.rb

@@ -82,7 +82,7 @@ describe Shelly::CLI::Deploys do
       it "should exit 1 with message" do
         exception = Shelly::Client::NotFoundException.new("resource" => "log")
         @client.stub(:deploy_log).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Log not found, list all deploy logs using  `shelly deploys list --cloud=foo-staging`")
+        $stdout.should_receive(:puts).with(red "Log not found, list all deploy logs using `shelly deploys list --cloud=foo-staging`")
         lambda { @deploys.show("last") }.should raise_error(SystemExit)
       end
     end

data/spec/shelly/cli/main_spec.rb

@@ -156,8 +156,8 @@ OUT
     context "on successful registration" do
       it "should display message about registration and email address confirmation" do
         @client.stub(:register_user).and_return(true)
-        $stdout.should_receive(:puts).with("Successfully registered!")
-        $stdout.should_receive(:puts).with("Check you mailbox for email address confirmation")
+        $stdout.should_receive(:puts).with(green "Successfully registered!")
+        $stdout.should_receive(:puts).with(green "Check you mailbox for email address confirmation")
         fake_stdin(["kate@example.com", "pass", "pass", "yes"]) do
           invoke(@main, :register)
         end
@@ -211,14 +211,14 @@ OUT
 
     context "on successful login" do
       it "should display message about successful login" do
-        $stdout.should_receive(:puts).with("Login successful")
+        $stdout.should_receive(:puts).with(green "Login successful")
         fake_stdin(["megan@example.com", "secret"]) do
           invoke(@main, :login)
         end
       end
 
       it "should accept email as parameter" do
-        $stdout.should_receive(:puts).with("Login successful")
+        $stdout.should_receive(:puts).with(green "Login successful")
         fake_stdin(["secret"]) do
           invoke(@main, :login, "megan@example.com")
         end
@@ -640,7 +640,7 @@ OUT
         raise_conflict("state" => "no_code")
         $stdout.should_receive(:puts).with(red "Not starting: no source code provided")
         $stdout.should_receive(:puts).with(red "Push source code using:")
-        $stdout.should_receive(:puts).with("  git push foo-production master")
+        $stdout.should_receive(:puts).with("`git push foo-production master`")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 

metadata

@@ -1,234 +1,280 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.1.9
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
-  requirement: *id001
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: guard
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: guard-rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: simplecov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: fakefs
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fakeweb
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 14
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.14.7
-  requirement: *id008
-  prerelease: false
   type: :runtime
-  name: wijet-thor
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.7
+- !ruby/object:Gem::Dependency
   name: rest-client
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: progressbar
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: grit
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id013
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: grit
+  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: launchy
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  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: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shelly-dependencies
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.1.1
-  requirement: *id014
-  prerelease: false
   type: :runtime
-  name: shelly-dependencies
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Tool for managing applications and clouds at shellycloud.com
-email: 
+email:
 - support@shellycloud.com
-executables: 
+executables:
 - shelly
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -283,36 +329,44 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shelly
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: []
-
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/deploys_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/runner_spec.rb
+- spec/shelly/cli/user_spec.rb
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb