shelly 0.1.20 → 0.1.21.pre

data/lib/shelly/app.rb

@@ -229,22 +229,22 @@ module Shelly
     end
 
     def upload(source)
-      rsync(source, "#{ssh['node_ip']}:/srv/glusterfs/disk")
+      rsync(source, "#{ssh['host']}:/srv/glusterfs/disk")
     end
 
     def download(relative_source, destination)
-      source = File.join("#{ssh['node_ip']}:/srv/glusterfs/disk", relative_source)
+      source = File.join("#{ssh['host']}:/srv/glusterfs/disk", relative_source)
       rsync(source, destination)
     end
 
     private
 
     def ssh
-      @ssh ||= shelly.node_and_port(code_name)
+      @ssh ||= shelly.console(code_name)
     end
 
     def ssh_command(command = "")
-      exec "ssh #{ssh_options} #{ssh['node_ip']} #{command}"
+      exec "ssh #{ssh_options} #{ssh['host']} #{command}"
     end
 
     def ssh_options

data/lib/shelly/client.rb

@@ -134,7 +134,7 @@ module Shelly
       post("/apps/#{cloud}/command", {:body => body, :type => type})
     end
 
-    def node_and_port(code_name)
+    def console(code_name)
       get("/apps/#{code_name}/console")
     end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.20"
+  VERSION = "0.1.21.pre"
 end

data/spec/shelly/app_spec.rb

@@ -310,9 +310,9 @@ describe Shelly::App do
 
   describe "#rake" do
     it "should return result of rake task" do
-      @client.stub(:node_and_port).and_return(
-        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo 10.0.0.1 rake_runner \"test\"")
+      @client.stub(:console).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo console.example.com rake_runner \"test\"")
       @app.rake("test")
     end
   end
@@ -340,27 +340,27 @@ describe Shelly::App do
 
   describe "#console" do
     it "should run ssh with all parameters" do
-      @client.stub(:node_and_port).and_return(
-        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo 10.0.0.1 ")
+      @client.stub(:console).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo console.example.com ")
       @app.console
     end
   end
 
   describe "#upload" do
     it "should run rsync with proper parameters" do
-      @client.stub(:node_and_port).and_return(
-        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path 10.0.0.1:/srv/glusterfs/disk")
+      @client.stub(:console).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/srv/glusterfs/disk")
       @app.upload("/path")
     end
   end
 
   describe "#download" do
     it "should run rsync with proper parameters" do
-      @client.stub(:node_and_port).and_return(
-        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress 10.0.0.1:/srv/glusterfs/disk/. /tmp")
+      @client.stub(:console).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/srv/glusterfs/disk/. /tmp")
       @app.download(".", "/tmp")
     end
   end
@@ -383,5 +383,5 @@ describe Shelly::App do
       Shelly::Cloudfile.should_receive(:new).and_return(cloudfile)
       @app.create_cloudfile
     end
-  end  
+  end
 end

data/spec/shelly/cli/files_spec.rb

@@ -21,8 +21,8 @@ describe Shelly::CLI::Files do
     end
 
     it "should upload files" do
-      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
-      @client.stub(:node_and_port).and_return(expected)
+      expected = {"host" => "console.example.com", "port" => "40010", "user" => "foo"}
+      @client.stub(:console).and_return(expected)
       @app.should_receive(:upload).with("some/path")
       invoke(@cli_files, :upload, "some/path")
     end
@@ -36,7 +36,7 @@ describe Shelly::CLI::Files do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
         lambda {
           invoke(@cli_files, :upload, "some/path")
@@ -57,8 +57,8 @@ describe Shelly::CLI::Files do
     end
 
     it "should download files" do
-      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
-      @client.stub(:node_and_port).and_return(expected)
+      expected = {"host" => "console.example.com", "port" => "40010", "user" => "foo"}
+      @client.stub(:console).and_return(expected)
       @app.should_receive(:download).with("some/path", "/destination")
       invoke(@cli_files, :download, "some/path", "/destination")
     end

data/spec/shelly/cli/main_spec.rb

@@ -1267,15 +1267,13 @@ We have been notified about it. We will be adding new resources shortly")
     end
 
     it "execute ssh command" do
-      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
-      @client.stub(:node_and_port).and_return(expected)
       @app.should_receive(:console)
       invoke(@main, :console)
     end
 
     context "Instances are not running" do
       it "should display error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run console.")
         lambda {
           invoke(@main, :console)

data/spec/shelly/client_spec.rb

@@ -217,13 +217,13 @@ describe Shelly::Client do
     end
   end
 
-  describe "#node_and_port" do
+  describe "#console" do
     it "should fetch instance data from API" do
-      body = {:port => "40010", :node_ip => "10.0.0.10", :user => "foo-production"}
+      body = {:port => "40010", :host => "console.example.com", :user => "foo-production"}
       FakeWeb.register_uri(:get, api_url("apps/staging-foo/console"),
         :body => body.to_json)
-      response = @client.node_and_port("staging-foo")
-      response.should == {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
+      response = @client.console("staging-foo")
+      response.should == {"port" => "40010", "host" => "console.example.com", "user"=>"foo-production"}
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.20
-  prerelease: 
+  version: 0.1.21.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -345,9 +345,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24