shelly 0.4.27 → 0.4.28.pre

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 28f1c401ce8ce75157e936a8026688c44348479c
-  data.tar.gz: e090819c15f52fb5e899a7e2cb42c460d7dbe4f8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTY0NDI5NTc5ZTU0ODgwNWRjYTllNDJmYjIwN2Q5OWYwNjNhODAxNg==
+  data.tar.gz: !binary |-
+    MTUwOTMxY2RkZDAwYTI4Y2E5YjhiOWYzZWJkMzkzYmQ4ZDliNWQyNw==
 SHA512:
-  metadata.gz: a74b2653e06afbeefc57dddaf8c2424b5600fb51935d7065f7f10903222fd35d5a73b264b77e1d43654c8f525ca85aa45b0d195d8c32570ad15a5475db4143c5
-  data.tar.gz: bb588554fdcc7bb9e10fe0fd6ec33025d2578f61f874a4d251f00952f72f51a2fbd4d479f8182626711eeda0478e0a83dd0e52f32c3f31e0c0ef8002caf4e67b
+  metadata.gz: !binary |-
+    MmNlNTNmZjMyYTc4YTI1MDA5YTNhZjViZmI4Yjg1YzgzOTg3MjAyM2JiMDYw
+    NGFiYzI2ZmViNWRjZTlkYzVmNTMxZTA4Yzg3MTM5NWRhOWM1MDMwMmFkMjhi
+    ZDdkZmZiYjhhMjNmOWRlZjI0MWNiOTkxYjMxZDViODFjMzc4NTg=
+  data.tar.gz: !binary |-
+    YThmZTgzZWIzZjI3Mzk2YjIwNzgwZWI2ZjUyNWQ5MmFmZmE1Y2VjMTE2NzNj
+    Nzk5MzYwMDFmMWUxZWE3YmQxNWJhNmNlOWY1NDZjOGMxNTliNTQ1NDFjZmRi
+    NjMxYWIzZDk4M2EzNzE3YzVlYmIyNjcyNjljZDE3OTA2ZGI1Y2Q=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## master / 2014-03-20
+
+* [feature] Support for `shelly ssh` command
+* [improvement] Show clockwork output in deployment logs
+
 ## 0.4.27 / 2014-03-19
 
 * [bugfix] Don't send body with GET and HEAD requests

data/lib/shelly/app.rb

@@ -216,15 +216,15 @@ module Shelly
     end
 
     def dbconsole
-      ssh_with_db_server(:command => "dbconsole")
+      ssh_with_db_server(:command => "start_dbconsole")
     end
 
     def mongoconsole
-      ssh_with_db_server(:command => "mongo")
+      ssh_with_db_server(:command => "start_mongodb")
     end
 
     def redis_cli
-      ssh_with_db_server(:command => "redis-cli")
+      ssh_with_db_server(:command => "start_redis")
     end
 
     def attributes
@@ -295,10 +295,14 @@ module Shelly
       Launchy.open("http://#{attributes["domain"]}")
     end
 
-    def console(server = nil)
+    def ssh_console(server = nil)
       ssh(:server => server)
     end
 
+    def console(server = nil)
+      ssh(:command => "start_console", :server => server)
+    end
+
     def list_files(path)
       ssh(:command => "ls -l #{persistent_disk}/#{path}")
     end

data/lib/shelly/cli/deploy.rb

@@ -64,6 +64,9 @@ module Shelly
           if content["sidekiq"]
             say("Starting sidekiq", :green); say(content["sidekiq"])
           end
+          if content["clockwork"]
+            say("Starting clockwork", :green); say(content["clockwork"])
+          end
           if content["thin_restart"]
             say("Starting thin", :green); say(content["thin_restart"])
           end

data/lib/shelly/cli/main.rb

@@ -30,7 +30,7 @@ module Shelly
       # FIXME: it should be possible to pass single symbol, instead of one element array
       before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop,
         :delete, :info, :ip, :logout, :execute, :rake, :setup, :console,
-        :dbconsole, :mongoconsole, :redis_cli]
+        :dbconsole, :mongoconsole, :redis_cli, :ssh]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
@@ -363,6 +363,20 @@ Wait until cloud is in 'turned off' state and try again.}
         say_error "Virtual server '#{options[:server]}' not found or not configured for running console"
       end
 
+      desc "ssh", "Log into virtual server"
+      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 ssh
+        app = multiple_clouds(options[:cloud], "ssh")
+        app.ssh_console(options[:server])
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot run ssh console."
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
+        say_error "Virtual server '#{options[:server]}' not found or not configured for running ssh console"
+      end
+
       # FIXME: move to helpers
       no_tasks do
         # Returns valid arguments for rake, removes shelly gem arguments

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.27"
+  VERSION = "0.4.28.pre"
 end

data/spec/shelly/app_spec.rb

@@ -429,7 +429,7 @@ describe Shelly::App do
     it "should return result of dbconsole" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com dbconsole")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_dbconsole")
       @app.dbconsole
     end
   end
@@ -438,7 +438,7 @@ describe Shelly::App do
     it "should return result of mongoconsole" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com mongo")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_mongodb")
       @app.mongoconsole
     end
   end
@@ -447,7 +447,7 @@ describe Shelly::App do
     it "should return result of redis-cli" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com redis-cli")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_redis")
       @app.redis_cli
     end
   end
@@ -474,11 +474,28 @@ describe Shelly::App do
     end
   end
 
-  describe "#console" do
+  describe "#ssh_console" do
     it "should run ssh with all parameters" do
       @client.stub(:tunnel).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
       @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com ")
+      @app.ssh_console
+    end
+
+    context "when server passed" do
+      it "should request console on given server" do
+        @client.should_receive(:tunnel).with("foo-staging", "ssh", "app1").and_return({})
+        @app.stub(:system)
+        @app.console("app1")
+      end
+    end
+  end
+
+  describe "#console" do
+    it "should run ssh with all parameters" do
+      @client.stub(:tunnel).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_console")
       @app.console
     end
 

data/spec/shelly/cli/deploy_spec.rb

@@ -113,6 +113,8 @@ describe Shelly::CLI::Deploy do
       $stdout.should_receive(:puts).with("delayed jobs")
       $stdout.should_receive(:puts).with(green "Starting sidekiq")
       $stdout.should_receive(:puts).with("sidekiq workers")
+      $stdout.should_receive(:puts).with(green "Starting clockwork")
+      $stdout.should_receive(:puts).with("clockwork output")
       $stdout.should_receive(:puts).with(green "Starting thin")
       $stdout.should_receive(:puts).with("thins up and running")
       $stdout.should_receive(:puts).with(green "Starting puma")
@@ -135,7 +137,7 @@ describe Shelly::CLI::Deploy do
         "after_restart" => "after restart hook", "before_restart" => "before restart hook",
         "before_symlink" => "before symlink hook", "before_migrate" => "before migrate hook",
         "after_successful_deploy_hook" => "after successful deploy hook",
-        "on_restart" => "on restart hook"
+        "on_restart" => "on restart hook", "clockwork" => "clockwork output"
       }
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -51,6 +51,7 @@ describe Shelly::CLI::Main do
       out.should include("shelly organization <command>  # View organizations")
       out.should include("shelly rake TASK               # Run rake task")
       out.should include("shelly redeploy                # Redeploy application")
+      out.should include("shelly ssh                     # Log into virtual server")
       out.should include("shelly redis-cli               # Run redis-cli")
       out.should include("shelly register [EMAIL]        # Register new account")
       out.should include("shelly setup                   # Set up git remotes for deployment on Shelly Cloud")
@@ -1626,6 +1627,43 @@ Wait until cloud is in 'turned off' state and try again.")
     end
   end
 
+  describe "#ssh" do
+    before do
+      setup_project
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :ssh).should include(:logged_in?)
+    end
+
+    it "should execute ssh command" do
+      @app.should_receive(:ssh_console)
+      invoke(@main, :ssh)
+    end
+
+    context "virtual servers are not running" do
+      it "should display error" do
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run ssh console.")
+        lambda {
+          invoke(@main, :ssh)
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "virtual server not found" do
+      it "should display error" do
+        ex = Shelly::Client::NotFoundException.new("resource" => "virtual_server")
+        @client.stub(:tunnel).and_raise(ex)
+        @main.options = {:server => "foobar"}
+        $stdout.should_receive(:puts).with(red "Virtual server 'foobar' not found or not configured for running ssh console")
+        lambda {
+          invoke(@main, :ssh)
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
   describe "#check" do
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)

metadata

@@ -1,223 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.4.28.pre
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -228,8 +228,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -324,14 +324,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 2.2.2