shelly 0.3.4 → 0.3.5.pre

data/lib/shelly/app.rb

@@ -269,7 +269,7 @@ module Shelly
     end
 
     def upload(source)
-      console_connection.tap do |conn|
+      tunnel_connection.tap do |conn|
         rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
       end
     end
@@ -281,7 +281,7 @@ module Shelly
     end
 
     def download(relative_source, destination)
-      console_connection.tap do |conn|
+      tunnel_connection.tap do |conn|
         source = File.join("#{conn['host']}:#{persistent_disk}", relative_source)
         rsync(source, destination, conn)
       end
@@ -291,6 +291,10 @@ module Shelly
       ssh(:command => "delete_file #{remote_path}")
     end
 
+    def setup_tunnel(conn, local_port)
+      system "ssh #{ssh_options(conn)} -N -L #{local_port}:localhost:#{conn['service']['port']} #{conn['host']}"
+    end
+
     # Public: Return databases for given Cloud in Cloudfile
     # Returns Array of databases
     def cloud_databases
@@ -351,6 +355,11 @@ module Shelly
       IO.popen(%Q{git log --no-merges --oneline --pretty=format:"#{format}" #{range}}).read.strip
     end
 
+    # Returns first at least configured virtual server
+    def tunnel_connection(service = "ssh", server = nil)
+      shelly.tunnel(code_name, service, server)
+    end
+
     private
 
     def assign_attributes(response)
@@ -373,18 +382,13 @@ module Shelly
       content["servers"].any? {|_, settings| settings.has_key?(option)}
     end
 
-    # Returns first at least configured virtual server
-    def console_connection(server = nil)
-      shelly.console(code_name, server)
-    end
-
     # Returns first at least configured virtual server if databases are configured
     def configured_db_server_connection(server = nil)
       shelly.configured_db_server(code_name, server)
     end
 
     def ssh(options = {})
-      conn = console_connection(options[:server])
+      conn = tunnel_connection("ssh", options[:server])
       system "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 

data/lib/shelly/cli/database.rb

@@ -6,7 +6,7 @@ module Shelly
     class Database < Command
       namespace :database
       include Helpers
-      before_hook :logged_in?, :only => [:reset]
+      before_hook :logged_in?, :only => [:reset, :tunnel]
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
       desc "reset KIND", "Reset database"
@@ -23,6 +23,22 @@ module Shelly
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot reset database."
       end
+
+      desc "tunnel KIND", "Setup tunnel to given database"
+      method_option :port, :type => :string, :aliases => "-p",
+        :desc => "Local port on which tunnel will be set up"
+      def tunnel(kind)
+        app = multiple_clouds(options[:cloud], "database tunnel")
+        local_port = options[:port] || 9900
+        conn = app.tunnel_connection(kind)
+        say "Connection details", :green
+        say "host:     localhost"
+        say "port:     #{local_port}"
+        say "database: #{conn['service']['database_name']}"
+        say "username: #{conn['service']['username']}"
+        say "password: #{conn['service']['password']}"
+        app.setup_tunnel(conn, local_port)
+      end
     end
   end
 end

data/lib/shelly/cli/deploy.rb

@@ -38,27 +38,32 @@ module Shelly
         specify_log(log)
         app = multiple_clouds(options[:cloud], "deploy show #{log}")
         content = app.deploy_log(log)
-        say "Log for deploy done on #{content["created_at"]}", :green
-        if content["bundle_install"]
-          say("Starting bundle install", :green); say(content["bundle_install"])
-        end
-        if content["whenever"]
-          say("Starting whenever", :green); say(content["whenever"])
-        end
-        if content["callbacks"]
-          say("Starting callbacks", :green); say(content["callbacks"])
-        end
-        if content["delayed_job"]
-          say("Starting delayed job", :green); say(content["delayed_job"])
-        end
-        if content["sidekiq"]
-          say("Starting sidekiq", :green); say(content["sidekiq"])
-        end
-        if content["thin_restart"]
-          say("Starting thin", :green); say(content["thin_restart"])
-        end
-        if content["puma_restart"]
-          say("Starting puma", :green); say(content["puma_restart"])
+        unless content.empty?
+          say "Log for deploy done on #{content["created_at"]}", :green
+          if content["bundle_install"]
+            say("Starting bundle install", :green); say(content["bundle_install"])
+          end
+          if content["whenever"]
+            say("Starting whenever", :green); say(content["whenever"])
+          end
+          if content["callbacks"]
+            say("Starting callbacks", :green); say(content["callbacks"])
+          end
+          if content["delayed_job"]
+            say("Starting delayed job", :green); say(content["delayed_job"])
+          end
+          if content["sidekiq"]
+            say("Starting sidekiq", :green); say(content["sidekiq"])
+          end
+          if content["thin_restart"]
+            say("Starting thin", :green); say(content["thin_restart"])
+          end
+          if content["puma_restart"]
+            say("Starting puma", :green); say(content["puma_restart"])
+          end
+        else
+          say_error("There was an error and log is not available", :with_exit => false)
+          say_error("Please contact our support https://shellycloud.com/support")
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :log

data/lib/shelly/client.rb

@@ -7,6 +7,7 @@ module Shelly
   class Client
     require 'shelly/client/errors'
     require 'shelly/client/shellyapp'
+    require 'shelly/client/tunnels'
     require 'shelly/client/users'
     require 'shelly/client/apps'
     require 'shelly/client/configs'

data/lib/shelly/client/apps.rb

@@ -33,12 +33,4 @@ class Shelly::Client
   def command(cloud, body, type)
     post("/apps/#{cloud}/command", {:body => body, :type => type})
   end
-
-  def console(code_name, server = nil)
-    get("/apps/#{code_name}/console", {:server => server})
-  end
-
-  def configured_db_server(code_name, server = nil)
-    get("/apps/#{code_name}/configured_db_server", {:server => server})
-  end
 end

data/lib/shelly/client/tunnels.rb

@@ -0,0 +1,10 @@
+class Shelly::Client
+  def tunnel(code_name, service, server = nil)
+    post("/apps/#{code_name}/tunnels", {:server => server, :service => service})
+  end
+
+  def configured_db_server(code_name, server = nil)
+    get("/apps/#{code_name}/configured_db_server",
+      {:server => server, :service => "ssh"})
+  end
+end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.3.4"
+  VERSION = "0.3.5.pre"
 end

data/spec/shelly/app_spec.rb

@@ -291,7 +291,7 @@ describe Shelly::App do
 
   describe "#rake" do
     it "should return result of rake task" do
-      @client.stub(:console).and_return(
+      @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 console.example.com rake_runner \"test\"")
       @app.rake("test")
@@ -349,7 +349,7 @@ describe Shelly::App do
 
   describe "#console" do
     it "should run ssh with all parameters" do
-      @client.stub(:console).and_return(
+      @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 console.example.com ")
       @app.console
@@ -357,7 +357,7 @@ describe Shelly::App do
 
     context "when server passed" do
       it "should request console on given server" do
-        @client.should_receive(:console).with("foo-staging", "app1").and_return({})
+        @client.should_receive(:tunnel).with("foo-staging", "ssh", "app1").and_return({})
         @app.stub(:system)
         @app.console("app1")
       end
@@ -373,7 +373,7 @@ describe Shelly::App do
 
   describe "#upload" do
     it "should run rsync with proper parameters" do
-      @client.stub(:console).and_return(
+      @client.stub(:tunnel).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
       @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/home/foo-staging/disk")
       @app.upload("/path")
@@ -382,7 +382,7 @@ describe Shelly::App do
 
   describe "#download" do
     it "should run rsync with proper parameters" do
-      @client.stub(:console).and_return(
+      @client.stub(:tunnel).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
       @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/home/foo-staging/disk/. /tmp")
       @app.download(".", "/tmp")
@@ -545,4 +545,11 @@ describe Shelly::App do
       @app.pending_commits.should == "c10c5f6 Some changes"
     end
   end
+
+  describe "#setup_tunnel" do
+    it "should setup tunnel with given options" do
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 43000 -l foo -N -L 9999:localhost:5432 console.example.com")
+      @app.setup_tunnel({"service" => {"port" => "5432"}, "host" => "console.example.com", "port" => 43000, "user" => "foo"}, 9999)
+    end
+  end
 end

data/spec/shelly/cli/database_spec.rb

@@ -30,4 +30,36 @@ describe Shelly::CLI::Database do
       end
     end
   end
+
+  describe "#tunnel" do
+    it "should ensure user has logged in" do
+      hooks(@database, :tunnel).should include(:logged_in?)
+    end
+
+    it "should show tunnel's details" do
+      @app.stub(:setup_tunnel)
+      conn = {
+        'service' => {
+          'database_name' => 'foo',
+          'username' => 'foo',
+          'password' => 'secret'
+        }
+      }
+      @app.should_receive(:tunnel_connection).and_return(conn)
+      $stdout.should_receive(:puts).with("host:     localhost")
+      $stdout.should_receive(:puts).with("port:     9900")
+      $stdout.should_receive(:puts).with("database: foo")
+      $stdout.should_receive(:puts).with("username: foo")
+      $stdout.should_receive(:puts).with("password: secret")
+      invoke(@database, :tunnel, "mongodb")
+    end
+
+    it "should setup tunnel" do
+      conn = {"host" => "localhost", "service" => {"port" => "27010"}}
+      @app.should_receive(:tunnel_connection).and_return(conn)
+      @app.should_receive(:setup_tunnel).with(conn, 10103)
+      @database.options = {:port => 10103}
+      invoke(@database, :tunnel, "mongodb")
+    end
+  end
 end

data/spec/shelly/cli/deploy_spec.rb

@@ -86,6 +86,15 @@ describe Shelly::CLI::Deploy do
       end
     end
 
+    context "log is missing" do
+      it "should show error about contact support" do
+        @client.should_receive(:deploy_log).with("foo-staging", "last").and_return({})
+        $stdout.should_receive(:puts).with(red "There was an error and log is not available")
+        $stdout.should_receive(:puts).with(red "Please contact our support https://shellycloud.com/support")
+        lambda { invoke(@deploys, :show, "last") }.should raise_error(SystemExit)
+      end
+    end
+
     def expected_output
       $stdout.should_receive(:puts).with(green "Log for deploy done on 2011-12-12 at 14:14:59")
       $stdout.should_receive(:puts).with(green "Starting bundle install")

data/spec/shelly/cli/file_spec.rb

@@ -28,7 +28,7 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot list files.")
         lambda {
           invoke(@cli_files, :list, "some/path")
@@ -45,7 +45,7 @@ describe Shelly::CLI::File do
 
     it "should upload files" do
       expected = {"host" => "console.example.com", "port" => "40010", "user" => "foo"}
-      @client.stub(:console).and_return(expected)
+      @client.stub(:tunnel).and_return(expected)
       @app.should_receive(:upload).with("some/path")
       invoke(@cli_files, :upload, "some/path")
     end
@@ -59,7 +59,7 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot upload files.")
         lambda {
           invoke(@cli_files, :upload, "some/path")
@@ -81,14 +81,14 @@ describe Shelly::CLI::File do
 
     it "should download files" do
       expected = {"host" => "console.example.com", "port" => "40010", "user" => "foo"}
-      @client.stub(:console).and_return(expected)
+      @client.stub(:tunnel).and_return(expected)
       @app.should_receive(:download).with("some/path", "/destination")
       invoke(@cli_files, :download, "some/path", "/destination")
     end
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot download files.")
         lambda {
           invoke(@cli_files, :download, "some/path")

data/spec/shelly/cli/main_spec.rb

@@ -1379,7 +1379,7 @@ Wait until cloud is in 'turned off' state and try again.")
 
     context "virtual servers are not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run console.")
         lambda {
           invoke(@main, :console)
@@ -1390,7 +1390,7 @@ Wait until cloud is in 'turned off' state and try again.")
     context "virtual server not found" do
       it "should display error" do
         ex = Shelly::Client::NotFoundException.new("resource" => "virtual_server")
-        @client.stub(:console).and_raise(ex)
+        @client.stub(:tunnel).and_raise(ex)
         @main.options = {:server => "foobar"}
         $stdout.should_receive(:puts).with(red "Virtual Server 'foobar' not found")
         lambda {

data/spec/shelly/client_spec.rb

@@ -250,12 +250,12 @@ describe Shelly::Client do
     end
   end
 
-  describe "#console" do
+  describe "#tunnel" do
     it "should fetch virtual server data from API" do
       body = {:port => "40010", :host => "console.example.com", :user => "foo-production"}
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo/console"),
+      FakeWeb.register_uri(:post, api_url("apps/staging-foo/tunnels"),
         :body => body.to_json)
-      response = @client.console("staging-foo")
+      response = @client.tunnel("staging-foo", "ssh")
       response.should == {"port" => "40010", "host" => "console.example.com", "user"=>"foo-production"}
     end
   end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  prerelease: 6
+  version: 0.3.5.pre
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -29,13 +29,13 @@ dependencies:
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
+  type: :development
   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
@@ -45,13 +45,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
+  type: :development
   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
@@ -61,13 +61,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
+  type: :development
   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
@@ -77,13 +77,45 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -93,13 +125,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
+  type: :development
   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
@@ -109,13 +141,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
+  type: :development
   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
@@ -125,13 +157,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -141,13 +173,13 @@ dependencies:
         version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: rest-client
+  type: :runtime
   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
@@ -157,13 +189,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
+  type: :runtime
   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
@@ -173,13 +205,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
+  type: :runtime
   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
@@ -189,13 +221,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
+  type: :runtime
   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
@@ -205,13 +237,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
+  type: :runtime
   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
@@ -264,6 +296,7 @@ files:
 - lib/shelly/client/organizations.rb
 - lib/shelly/client/shellyapp.rb
 - lib/shelly/client/ssh_keys.rb
+- lib/shelly/client/tunnels.rb
 - lib/shelly/client/users.rb
 - lib/shelly/cloudfile.rb
 - lib/shelly/download_progress_bar.rb
@@ -315,22 +348,39 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3404836754866729086
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3404836754866729086
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 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/database_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
+- spec/shelly/cli/logs_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/organization_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/organization_spec.rb
+- spec/shelly/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb