shelly 0.4.41 → 0.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51d37e659ed7cc8bc5bee3233fac5a548fb6ed8
-  data.tar.gz: 38461f9c3e60cff1987f97371b0c62119ffd6f13
+  metadata.gz: bd0f3635267e3be6e9d6fbff86054582b6ac3b9f
+  data.tar.gz: 63d62d167f8245525f44a317e39d72529f1a0037
 SHA512:
-  metadata.gz: efb13c5c2604592df1d851bdecc0f38757238f37729e3e6909ea71c28ced80614e4449f2970efc1782b8e6a9ade1aeb05451bc4d3c99d4d9df7f30e213d602a5
-  data.tar.gz: 9d1a88f31501cc14966a420de0b2e011d793a7c2ec65f6239a61bee206484cd6fc47b30f7d5f255fc1d23ec2a31a874ba92f6948bd77935f3c6177971fadda57
+  metadata.gz: 7c4780ffcc4713f920354d5e7a4c9a8421b51382a956f3b0acea83023d28c016fe2a7cb1091093464ec8799d4963ed4c2a3b2f14a6d2d73233d85d332bb29593
+  data.tar.gz: 7dee1731a302343f71c175fe6dc87695639d21e55f77ee1d8b8a77d95d7f75a65a3ff11ddf61b4d1822422cae98877194eb9de834d1d7fb5acf3c65c94f20b51

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.42 / 2014-12-14
+
+* [improvement] Added --server / -s option for shelly rake command, so user
+  is able to run rake task on given virtual server
+
 ## 0.4.41 / 2014-12-11
 
 * [improvement] Updated mime-types dependency

data/lib/shelly/app.rb

@@ -235,8 +235,8 @@ module Shelly
       shelly.delete_endpoint(code_name, uuid)
     end
 
-    def rake(task)
-      ssh(:command => "rake_runner \"#{task}\"")
+    def rake(task, server = nil)
+      ssh(:command => "rake_runner \"#{task}\"", :server => server)
     end
 
     def dbconsole

data/lib/shelly/cli/main.rb

@@ -289,13 +289,20 @@ Wait until cloud is in 'turned off' state and try again.}
       end
 
       desc "rake TASK", "Run rake task"
-      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify cloud"
+      method_option :server, :type => :string, :aliases => "-s",
+        :desc => "Specify virtual server, it's random by default"
       def rake(task = nil)
         task = rake_args.join(" ")
         app = multiple_clouds(options[:cloud], "rake #{task}")
-        app.rake(task)
+        app.rake(task, options[:server])
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run rake task."
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
+        say_error "Virtual server '#{options[:server]}' not found or" \
+          " not configured for running rake task."
       end
 
       desc "dbconsole", "Run rails dbconsole"
@@ -393,7 +400,7 @@ Wait until cloud is in 'turned off' state and try again.}
             args.each do |arg|
               case arg
               when "rake", "--debug"
-              when "--cloud", "-c"
+              when "--cloud", "-c", "--server", "-s"
                 skip_next = true
               else
                 out << arg unless skip_next

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.41"
+  VERSION = "0.4.42"
 end

data/spec/shelly/app_spec.rb

@@ -421,6 +421,15 @@ describe Shelly::App do
       @app.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com rake_runner \"test\"")
       @app.rake("test")
     end
+
+    context "when server option is present" do
+      it "should run rake task on given server" do
+        @client.should_receive(:tunnel).
+          with("foo-staging", "ssh", "app1").and_return({})
+        @app.should_receive(:childprocess)
+        @app.rake("test", "app1")
+      end
+    end
   end
 
   describe "#dbconsole" do

data/spec/shelly/cli/main_spec.rb

@@ -1442,7 +1442,7 @@ Wait until cloud is in 'turned off' state and try again.")
     end
 
     it "should invoke rake task" do
-      @app.should_receive(:rake).with("db:migrate")
+      @app.should_receive(:rake).with("db:migrate", nil)
       invoke(@main, :rake, "db:migrate")
     end
 
@@ -1450,7 +1450,7 @@ Wait until cloud is in 'turned off' state and try again.")
       before { @main.unstub!(:rake_args) }
 
       it "should return Array of rake arguments (skipping shelly gem arguments)" do
-        argv = %w(rake -T db --cloud foo-production --debug)
+        argv = %w(rake -T db --server app1 --cloud foo-production --debug)
         @main.rake_args(argv).should == %w(-T db)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.41
+  version: 0.4.42
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool