shelly 0.2.14 → 0.2.15

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.15 / 2013-03-28
+
+* [feature] `shelly files list [PATH]` lists files from cloud's disk
+* [feature] Destination virtual server for `shelly console` can be specified.
+Example `shelly console --server app1`. When not specyfied virtual server is chosen randomly.
+
 ## 0.2.14 / 2013-03-28
 
 * [bug] Structure validator recognizes puma as allowed web server

data/lib/shelly/app.rb

@@ -173,11 +173,11 @@ module Shelly
     end
 
     def rake(task)
-      ssh_command("rake_runner \"#{task}\"")
+      ssh(:command => "rake_runner \"#{task}\"")
     end
 
     def dbconsole
-      ssh_command("dbconsole")
+      ssh(:command => "dbconsole")
     end
 
     def attributes
@@ -220,21 +220,27 @@ module Shelly
       Launchy.open("http://#{attributes["domain"]}")
     end
 
-    def console
-      ssh_command
+    def console(server = nil)
+      ssh(:server => server)
+    end
+
+    def list_files(path)
+      ssh(:command => "ls -l /srv/glusterfs/disk/#{path}")
     end
 
     def upload(source)
-      rsync(source, "#{ssh['host']}:/srv/glusterfs/disk")
+      conn = console_connection
+      rsync(source, "#{conn['host']}:/srv/glusterfs/disk")
     end
 
     def download(relative_source, destination)
-      source = File.join("#{ssh['host']}:/srv/glusterfs/disk", relative_source)
+      conn = console_connection
+      source = File.join("#{conn['host']}:/srv/glusterfs/disk", relative_source)
       rsync(source, destination)
     end
 
     def delete_file(remote_path)
-      ssh_command("delete_file #{remote_path}")
+      ssh(:command => "delete_file #{remote_path}")
     end
 
     # Public: Return databases for given Cloud in Cloudfile
@@ -292,16 +298,17 @@ module Shelly
       content["servers"].any? {|_, settings| settings.has_key?(option)}
     end
 
-    def ssh
-      @ssh ||= shelly.console(code_name)
+    def console_connection(server = nil)
+      shelly.console(code_name, server)
     end
 
-    def ssh_command(command = "")
-      exec "ssh #{ssh_options} -t #{ssh['host']} #{command}"
+    def ssh(options = {})
+      conn = console_connection(options[:server])
+      exec "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 
-    def ssh_options
-      "-o StrictHostKeyChecking=no -p #{ssh['port']} -l #{ssh['user']}"
+    def ssh_options(conn = console_connection)
+      "-o StrictHostKeyChecking=no -p #{conn['port']} -l #{conn['user']}"
     end
 
     def rsync(source, destination)

data/lib/shelly/cli/file.rb

@@ -10,6 +10,14 @@ module Shelly
       before_hook :require_rsync, :only => [:upload, :download]
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
+      desc "list [PATH]", "List files in given path"
+      def list(path = "/")
+        app = multiple_clouds(options[:cloud], "file list #{path}")
+        app.list_files(path)
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot list files."
+      end
+
       desc "upload PATH", "Upload files to persistent data storage"
       def upload(path)
         app = multiple_clouds(options[:cloud], "file upload #{path}")

data/lib/shelly/cli/main.rb

@@ -395,11 +395,16 @@ Wait until cloud is in 'turned off' state and try again.}
 
       desc "console", "Open application console"
       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 console
         app = multiple_clouds(options[:cloud], "console")
-        app.console
+        app.console(options[:server])
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run console."
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
+        say_error "Virtual Server '#{options[:server]}' not found"
       end
 
       desc "check", "Check if application fulfills Shelly Cloud requirements"

data/lib/shelly/client.rb

@@ -147,8 +147,8 @@ module Shelly
       post("/apps/#{cloud}/command", {:body => body, :type => type})
     end
 
-    def console(code_name)
-      get("/apps/#{code_name}/console")
+    def console(code_name, server = nil)
+      get("/apps/#{code_name}/console", {:server => server})
     end
 
     def deploy_logs(cloud)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/spec/shelly/app_spec.rb

@@ -343,6 +343,21 @@ describe Shelly::App do
       @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com ")
       @app.console
     end
+
+    context "when server passed" do
+      it "should request console on given server" do
+        @client.should_receive(:console).with("foo-staging", "app1").and_return({})
+        @app.stub(:exec)
+        @app.console("app1")
+      end
+    end
+  end
+
+  describe "#list_files" do
+    it "should list files for given subpath in disk" do
+      @app.should_receive(:ssh).with(:command => "ls -l /srv/glusterfs/disk/foo")
+      @app.list_files("foo")
+    end
   end
 
   describe "#upload" do
@@ -365,7 +380,7 @@ describe Shelly::App do
 
   describe "#delete_file" do
     it "should delete file over ssh" do
-      @app.should_receive(:ssh_command).with("delete_file foo/bar")
+      @app.should_receive(:ssh).with(:command => "delete_file foo/bar")
       @app.delete_file("foo/bar")
     end
   end

data/spec/shelly/cli/file_spec.rb

@@ -16,6 +16,28 @@ describe Shelly::CLI::File do
     File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
   end
 
+  describe "#list" do
+    it "should ensure user has logged in" do
+      hooks(@cli_files, :upload).should include(:logged_in?)
+    end
+
+    it "should list files" do
+      @app.should_receive(:list_files).with("some/path")
+      invoke(@cli_files, :list, "some/path")
+    end
+
+    context "cloud is not running" do
+      it "should display error" do
+        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot list files.")
+        lambda {
+          invoke(@cli_files, :list, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
+
+  end
+
   describe "#upload" do
     it "should ensure user has logged in" do
       hooks(@cli_files, :upload).should include(:logged_in?)

data/spec/shelly/cli/main_spec.rb

@@ -1415,7 +1415,7 @@ Wait until cloud is in 'turned off' state and try again.")
       invoke(@main, :console)
     end
 
-    context "Instances are not running" do
+    context "virtual servers are not running" do
       it "should display error" do
         @client.stub(:console).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run console.")
@@ -1424,6 +1424,18 @@ Wait until cloud is in 'turned off' state and try again.")
         }.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(:console).and_raise(ex)
+        @main.options = {:server => "foobar"}
+        $stdout.should_receive(:puts).with(red "Virtual Server 'foobar' not found")
+        lambda {
+          invoke(@main, :console)
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#dbconsole" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.14
   prerelease: 
+  version: 0.2.15
 platform: ruby
 authors:
 - Shelly Cloud team
@@ -13,13 +13,13 @@ date: 2013-03-28 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,29 @@ 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
@@ -92,14 +108,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
   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
@@ -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
@@ -291,8 +323,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.24
+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/deploy_spec.rb
+- spec/shelly/cli/file_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