shelly 0.4.4 → 0.4.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.5 / 2013-09-24
+
+* [improvement] Print user-friendly message for bad .netrc file permission.
+* [improvement] Added 'Running' prefix for commands executed by gem.
+
 ## 0.4.4 / 2013-09-10
 
 * [bugfix] Do not show `shelly deploys show last` instruction if last deployment was made by admin and was failed.

data/lib/shelly/cli/backup.rb

@@ -130,7 +130,6 @@ module Shelly
         say "Uploading done", :green
         say "Importing database", :green
         app.import_database(kind, archive, connection["server"])
-        say "Database imported successfully", :green
       rescue Client::ConflictException => e
         say_error "Cloud #{app} wasn't deployed properly. Cannot import database."
       end
@@ -138,7 +137,7 @@ module Shelly
       no_tasks do
         def compress(filename)
           archive_name = "#{::File.basename(filename)}-#{Time.now.to_i}.tar.bz2"
-          say "Compressing #{filename} into #{archive_name}", :green
+          say "Running: tar -cjf #{archive_name} #{filename}", :green
           system("tar -cjf #{archive_name} #{filename}")
           archive_name
         end

data/lib/shelly/cli/deploy.rb

@@ -73,6 +73,8 @@ module Shelly
       desc "pending", "Show commits which haven't been deployed yet"
       def pending
         app = multiple_clouds(options[:cloud], "deploy pending")
+        say "Running: git fetch shelly"
+        say_new_line
         app.git_fetch_remote
         if app.deployed?
           commits = app.pending_commits

data/lib/shelly/cli/main.rb

@@ -178,9 +178,9 @@ Wait until cloud is in 'turned off' state and try again.}
         say_new_line
         app.git_url = app.attributes["git_info"]["repository_url"]
         if overwrite_default_remote?(app)
-          say "git remote add shelly #{app.git_url}"
+          say "Running: git remote add shelly #{app.git_url}"
           app.add_git_remote
-          say "git fetch shelly"
+          say "Running: git fetch shelly"
           app.git_fetch_remote
         else
           loop do
@@ -188,9 +188,9 @@ Wait until cloud is in 'turned off' state and try again.}
             if app.git_remote_exist?(remote)
               say("Remote '#{remote}' already exists")
             else
-              say "git remote add #{remote} #{app.git_url}"
+              say "Running: git remote add #{remote} #{app.git_url}"
               app.add_git_remote(remote)
-              say "git fetch #{remote}"
+              say "Running: git fetch #{remote}"
               app.git_fetch_remote(remote)
               break
             end
@@ -386,7 +386,7 @@ Wait until cloud is in 'turned off' state and try again.}
 
         def add_remote(app)
           remote = if overwrite_default_remote?(app)
-            say "Adding remote shelly #{app.git_url}", :green
+            say "Running: git remote add shelly #{app.git_url}", :green
             "shelly"
           else
             loop do
@@ -394,7 +394,7 @@ Wait until cloud is in 'turned off' state and try again.}
               if app.git_remote_exist?(remote)
                 say("Remote '#{remote}' already exists")
               else
-                say "Adding remote #{remote} #{app.git_url}", :green
+                say "Running: git remote add #{remote} #{app.git_url}", :green
                 break remote
               end
             end

data/lib/shelly/cli/runner.rb

@@ -34,6 +34,9 @@ module Shelly
         raise if debug?
         say_new_line
         say_error "[canceled]"
+      rescue Netrc::Error => e
+        raise if debug?
+        say_error e.message
       rescue Client::APIException => e
         raise if debug?
         say_error "You have found a bug in the shelly gem. We're sorry.",

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -278,7 +278,7 @@ describe Shelly::CLI::Backup do
 
     it "should compress file" do
       @backup.should_receive(:system).with("tar -cjf dump.sql-1370879705.tar.bz2 dump.sql")
-      $stdout.should_receive(:puts).with(green "Compressing dump.sql into dump.sql-1370879705.tar.bz2")
+      $stdout.should_receive(:puts).with(green "Running: tar -cjf dump.sql-1370879705.tar.bz2 dump.sql")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "postgresql", "dump.sql")
       end

data/spec/shelly/cli/deploy_spec.rb

@@ -132,6 +132,7 @@ describe Shelly::CLI::Deploy do
     end
 
     it "should fetch git references from shelly" do
+      $stdout.should_receive(:puts).with("Running: git fetch shelly")
       @app.should_receive(:git_fetch_remote)
       @app.stub(:pending_commits => "commit")
       invoke(@deploys, :pending)

data/spec/shelly/cli/main_spec.rb

@@ -444,7 +444,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
     context "git remote" do
       it "should add one if it doesn't exist" do
-        $stdout.should_receive(:puts).with("\e[32mAdding remote shelly git@git.shellycloud.com:foooo.git\e[0m")
+        $stdout.should_receive(:puts).with(green "Running: git remote add shelly git@git.shellycloud.com:foooo.git")
         @app.should_receive(:add_git_remote).with("shelly")
 
         fake_stdin(["foooo", ""]) do
@@ -459,7 +459,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
         it "should ask if one exist and overwrite" do
           $stdout.should_receive(:print).with("Git remote shelly exists, overwrite (yes/no):  ")
-          $stdout.should_receive(:puts).with(green "Adding remote shelly git@git.shellycloud.com:foooo.git")
+          $stdout.should_receive(:puts).with(green "Running: git remote add shelly git@git.shellycloud.com:foooo.git")
           @app.should_receive(:add_git_remote).with("shelly")
 
           fake_stdin(["foooo", "", "yes"]) do
@@ -471,7 +471,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           @app.stub(:git_remote_exist?).with('test').and_return(false)
           $stdout.should_receive(:print).with("Git remote shelly exists, overwrite (yes/no):  ")
           $stdout.should_receive(:print).with("Specify remote name: ")
-          $stdout.should_receive(:puts).with(green "Adding remote test git@git.shellycloud.com:foooo.git")
+          $stdout.should_receive(:puts).with(green "Running: git remote add test git@git.shellycloud.com:foooo.git")
           $stdout.should_receive(:puts).with("  git push test master")
           @app.should_receive(:add_git_remote).with("test")
 
@@ -1072,8 +1072,8 @@ Wait until cloud is in 'turned off' state and try again.")
 
     it "should show info about adding remote and fetching changes" do
       $stdout.should_receive(:puts).with(green "Setting up foo-staging cloud")
-      $stdout.should_receive(:puts).with("git remote add shelly git_url")
-      $stdout.should_receive(:puts).with("git fetch shelly")
+      $stdout.should_receive(:puts).with("Running: git remote add shelly git_url")
+      $stdout.should_receive(:puts).with("Running: git fetch shelly")
       $stdout.should_receive(:puts).with(green "Your application is set up.")
       invoke(@main, :setup)
     end
@@ -1104,8 +1104,8 @@ Wait until cloud is in 'turned off' state and try again.")
 
         it "should show info about adding default remote and fetching changes" do
           $stdout.should_receive(:puts).with(green "Setting up foo-staging cloud")
-          $stdout.should_receive(:puts).with("git remote add shelly git_url")
-          $stdout.should_receive(:puts).with("git fetch shelly")
+          $stdout.should_receive(:puts).with("Running: git remote add shelly git_url")
+          $stdout.should_receive(:puts).with("Running: git fetch shelly")
           $stdout.should_receive(:puts).with(green "Your application is set up.")
           fake_stdin(["yes"]) do
             invoke(@main, :setup)
@@ -1130,8 +1130,8 @@ Wait until cloud is in 'turned off' state and try again.")
         it "should show info about adding custom remote and fetching changes" do
           $stdout.should_receive(:puts).with(green "Setting up foo-staging cloud")
           $stdout.should_receive(:print).with("Specify remote name: ")
-          $stdout.should_receive(:puts).with("git remote add remote git_url")
-          $stdout.should_receive(:puts).with("git fetch remote")
+          $stdout.should_receive(:puts).with("Running: git remote add remote git_url")
+          $stdout.should_receive(:puts).with("Running: git fetch remote")
           $stdout.should_receive(:puts).with(green "Your application is set up.")
           fake_stdin(["no", "remote"]) do
             invoke(@main, :setup)

data/spec/shelly/cli/runner_spec.rb

@@ -107,6 +107,13 @@ describe Shelly::CLI::Runner do
         }.should raise_error(RuntimeError)
       end
 
+      it "should re-raise netrc exception" do
+        Shelly::CLI::Main.stub(:start).and_raise(Netrc::Error.new)
+        lambda {
+          @runner.start
+        }.should raise_error(Netrc::Error)
+      end
+
       it "should re-raise unauthorized exception" do
         Shelly::CLI::Main.stub(:start).and_raise(Shelly::Client::UnauthorizedException.new)
         lambda {
@@ -139,6 +146,15 @@ describe Shelly::CLI::Runner do
         }.should raise_error(SystemExit)
       end
 
+      it "should rescue netrc exception and display message" do
+        Shelly::CLI::Main.stub(:start).and_raise(Netrc::Error.new("Error"))
+        runner = Shelly::CLI::Runner.new(%w(start))
+        $stdout.should_receive(:puts).with("Error")
+        lambda {
+          runner.start
+        }.should raise_error(SystemExit)
+      end
+
       it "should catch exception thrown by API Client" do
         Shelly::CLI::Main.stub(:start).and_raise(Shelly::Client::APIException.new({}, 500, "test123"))
         runner = Shelly::CLI::Runner.new(%w(version))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -322,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 503882181162997547
+      hash: 74743708609339319
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 503882181162997547
+      hash: 74743708609339319
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.25