shelly 0.4.19 → 0.4.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjNhNzAxMmI5MDcwMTQ5ZTg0Mzg0MGQ5MmQ5ZWEwM2JmYTY1Y2VlYQ==
+    NDdlYTA5ZTNlZDdhNTdhNDNmNjFiMzE2Njk0ZDZjN2NiOTBiZjYyMw==
   data.tar.gz: !binary |-
-    NzUyMDQ4OTRhMjE1ODMxMTY0ODJhNTY1ZTVmZGQxNThmOWIxNmQyNg==
+    NGNhNjJjZmIzZTE4NDkyMjIzOThkYWE0Yjk1Y2RjODdmNDJlODc0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NjVmNjZiZGVhNzA2M2VlMjc0MjBhYjg0ZGI5MjgyMmI1OGIzNGRjOTM4MThl
-    M2I4ZjUwYjk4NGRiOWYwOWFiNDY5NTY4ODUyNGVhMTgyMzIzY2M0Mzc0MjBh
-    OTJiODViMzkwZjdjZTg2MjFhZGU2NTMyZTVjZjhiNTVjNWFkNGY=
+    NzI5YWUxNDAxNzExNGJkNjFiNGE1ZTM5NjAwN2ZiMmNjYjljODMzNmI5NDdk
+    ZTEyMjBkNzBhZWY2YmE2NDY0ZDNiMWZlNTFlNjVkMGE0MjFiZWY1M2Q1MDY5
+    NDkyZjUyYzY2NjQwNmM1YzE1YTYwZjY0MTc0MTdkZDFhZmIzYzM=
   data.tar.gz: !binary |-
-    ZjBlNjZhNDAyNTk1MzAzY2E2MTk5NTg5ZDUwMzliMjBlMDE3NjhmN2YzMjJm
-    NGRlMjQ2NGI3ZTVhYzdkZWE0NDNiNDgyNWQ0MzhjZTBiYWYxYmNiMTg3Yzhj
-    OGZjZjdhMjg3M2UyMmFhYmU1NzNmYTk4ZjAzMDQwNzE3ZjQ0MzI=
+    NjhkYjkwY2QxZTMwMzBjNDU5MzFlODZlMjVkNmQ0NmEwMTAzMTk5MWIxZGMw
+    MGFlYzhiNjBiNWVlOGYzZTk0YzE1ZjA5ODgyZGZkYjZmYjc2YTdjNGYzMWI4
+    ZDNlODlkMzYxZTMyNGYzYjhmOTdkM2Q2MDgzMTIzNzcyNDI5YmU=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.4.21 / 2014-01-15
+
+* [improvement] destination path when uploading files to Shelly Cloud
+  `shelly files upload source destination`
+
+## 0.4.20 / 2014-01-14
+
+* [improvement] add 2.1.0 and rbx to supported ruby versions
+* [improvement] `shelly deploy show` will show output of the on_restart hook
+
 ## 0.4.19 / 2013-12-26
 
 * [bugfix] `shelly delete` fixed remove git remote when deleting cloud

data/lib/shelly/app.rb

@@ -299,9 +299,9 @@ module Shelly
       ssh(:command => "ls -l #{persistent_disk}/#{path}")
     end
 
-    def upload(source)
+    def upload(source, destination)
       tunnel_connection.tap do |conn|
-        rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
+        rsync(source, "#{conn['host']}:#{persistent_disk}/#{destination}", conn, "--relative")
       end
     end
 
@@ -452,8 +452,8 @@ module Shelly
       "-o StrictHostKeyChecking=no -p #{conn['port']} -l #{conn['user']}"
     end
 
-    def rsync(source, destination, conn)
-      system "rsync -avz -e 'ssh #{ssh_options(conn)}' --progress #{source} #{destination}"
+    def rsync(source, destination, conn, options = "")
+      system "rsync --archive --verbose --compress #{options} -e 'ssh #{ssh_options(conn)}' --progress #{source} #{destination}"
     end
   end
 end

data/lib/shelly/cli/deploy.rb

@@ -55,6 +55,9 @@ module Shelly
           if content["before_restart"]
             say("Before restart hook", :green); say(content["before_restart"])
           end
+          if content["on_restart"]
+            say("On restart hook", :green); say(content["on_restart"])
+          end
           if content["delayed_job"]
             say("Starting delayed job", :green); say(content["delayed_job"])
           end

data/lib/shelly/cli/file.rb

@@ -20,10 +20,10 @@ module Shelly
         say_error "Cloud #{app} wasn't deployed properly. Cannot list files."
       end
 
-      desc "upload PATH", "Upload files to persistent data storage"
-      def upload(path)
-        app = multiple_clouds(options[:cloud], "file upload #{path}")
-        app.upload(path)
+      desc "upload SOURCE_PATH [DEST_PATH]", "Upload files to persistent data storage"
+      def upload(source, destination = ".")
+        app = multiple_clouds(options[:cloud], "file upload #{source} #{destination}")
+        app.upload(source, destination)
       rescue Client::NotFoundException => e
         say_error e["message"]
       rescue Client::ConflictException

data/lib/shelly/cli/main/check.rb

@@ -29,7 +29,7 @@ module Shelly
 
         if structure.gemfile_ruby_version?
           if structure.gemfile_engine == 'ruby'
-            print_check(!['1.8.7', '2.1.0'].include?(structure.gemfile_ruby_version),
+            print_check(!['1.8.7'].include?(structure.gemfile_ruby_version),
               "#{structure.gemfile_engine} #{structure.gemfile_ruby_version} is supported",
               "#{structure.gemfile_engine} #{structure.gemfile_ruby_version} is currently unsupported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions",
               :show_fulfilled => verbose)
@@ -41,7 +41,7 @@ module Shelly
               :show_fulfilled => verbose)
           end
 
-          supported_jruby = '1.7.8'
+          supported_jruby = '1.7.10'
           if structure.gemfile_engine == 'jruby'
             print_check(!(structure.gemfile_ruby_version == '1.8.7' ||
                 structure.gemfile_engine_version != supported_jruby),
@@ -50,8 +50,8 @@ module Shelly
               :show_fulfilled => verbose)
           end
 
-          # other platforms: rbx, mingw, mswin show instant error
-          unless ['jruby', 'ruby'].include?(structure.gemfile_engine)
+          # other platforms: mingw, mswin show instant error
+          unless ['jruby', 'ruby', 'rbx'].include?(structure.gemfile_engine)
             print_check(false, "",
               "Your ruby engine: #{structure.gemfile_engine} is currently unsupported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions",
               :show_fulfilled => verbose)

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby_version: <%= @ruby_version %> # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: <%= @ruby_version %> # 2.1.0, 2.0.0, jruby, rbx, 1.9.3, 1.9.2 or ree-1.8.7
   environment: <%= @environment %> # RAILS_ENV
   monitoring_email: <%= @email %>
   domains:

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.19"
+  VERSION = "0.4.21"
 end

data/spec/shelly/app_spec.rb

@@ -479,8 +479,8 @@ describe Shelly::App do
       @app.stub(:attributes => {"system_user" => "system_user"})
       @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/system_user/disk")
-      @app.upload("/path")
+      @app.should_receive(:system).with("rsync --archive --verbose --compress --relative -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/home/system_user/disk/.")
+      @app.upload("/path", ".")
     end
   end
 
@@ -489,7 +489,7 @@ describe Shelly::App do
       @app.stub(:attributes => {"system_user" => "system_user"})
       @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/system_user/disk/. /tmp")
+      @app.should_receive(:system).with("rsync --archive --verbose --compress  -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/home/system_user/disk/. /tmp")
       @app.download(".", "/tmp")
     end
   end

data/spec/shelly/cli/deploy_spec.rb

@@ -107,6 +107,8 @@ describe Shelly::CLI::Deploy do
       $stdout.should_receive(:puts).with("before symlink hook")
       $stdout.should_receive(:puts).with(green "Before restart hook")
       $stdout.should_receive(:puts).with("before restart hook")
+      $stdout.should_receive(:puts).with(green "On restart hook")
+      $stdout.should_receive(:puts).with("on restart hook")
       $stdout.should_receive(:puts).with(green "Starting delayed job")
       $stdout.should_receive(:puts).with("delayed jobs")
       $stdout.should_receive(:puts).with(green "Starting sidekiq")
@@ -132,7 +134,8 @@ describe Shelly::CLI::Deploy do
         "sidekiq" => "sidekiq workers", "db_migrate" => "rake db:migrate",
         "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"
+        "after_successful_deploy_hook" => "after successful deploy hook",
+        "on_restart" => "on restart hook"
       }
     end
   end

data/spec/shelly/cli/file_spec.rb

@@ -60,7 +60,7 @@ describe Shelly::CLI::File do
     it "should upload files" do
       expected = {"host" => "console.example.com", "port" => "40010", "user" => "foo"}
       @client.stub(:tunnel).and_return(expected)
-      @app.should_receive(:upload).with("some/path")
+      @app.should_receive(:upload).with("some/path", ".")
       invoke(@cli_files, :upload, "some/path")
     end
 

data/spec/shelly/cli/main_spec.rb

@@ -1658,9 +1658,9 @@ Wait until cloud is in 'turned off' state and try again.")
         context "supported version" do
           it "should show checked message" do
             Bundler::Definition.stub_chain(:build, :ruby_version).
-              and_return(mock(:engine => 'jruby', :version => '1.9.3', :engine_version => '1.7.8'))
+              and_return(mock(:engine => 'jruby', :version => '1.9.3', :engine_version => '1.7.10'))
 
-            $stdout.should_receive(:puts).with("  #{green("✓")} jruby 1.7.8 (1.9 mode) is supported")
+            $stdout.should_receive(:puts).with("  #{green("✓")} jruby 1.7.10 (1.9 mode) is supported")
             invoke(@main, :check)
           end
         end
@@ -1668,9 +1668,9 @@ Wait until cloud is in 'turned off' state and try again.")
         context "unsupported version" do
           it "should show error message - ruby version" do
             Bundler::Definition.stub_chain(:build, :ruby_version).
-              and_return(mock(:engine => 'jruby', :version => '1.8.7', :engine_version => '1.7.8'))
+              and_return(mock(:engine => 'jruby', :version => '1.8.7', :engine_version => '1.7.10'))
 
-            $stdout.should_receive(:puts).with("  #{red("✗")} Only jruby 1.7.8 (1.9 mode) is currently supported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
+            $stdout.should_receive(:puts).with("  #{red("✗")} Only jruby 1.7.10 (1.9 mode) is currently supported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
             invoke(@main, :check)
           end
 
@@ -1678,7 +1678,7 @@ Wait until cloud is in 'turned off' state and try again.")
             Bundler::Definition.stub_chain(:build, :ruby_version).
               and_return(mock(:engine => 'jruby', :version => '1.9.3', :engine_version => '1.7.3'))
 
-            $stdout.should_receive(:puts).with("  #{red("✗")} Only jruby 1.7.8 (1.9 mode) is currently supported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
+            $stdout.should_receive(:puts).with("  #{red("✗")} Only jruby 1.7.10 (1.9 mode) is currently supported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
             invoke(@main, :check)
           end
         end
@@ -1697,9 +1697,9 @@ Wait until cloud is in 'turned off' state and try again.")
       context "other engines" do
         it "should show unsupported error message" do
           Bundler::Definition.stub_chain(:build, :ruby_version).
-            and_return(mock(:engine => 'rbx', :version => '1.9.2'))
+            and_return(mock(:engine => 'mswin', :version => '1.9.2'))
 
-          $stdout.should_receive(:puts).with("  #{red("✗")} Your ruby engine: rbx is currently unsupported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
+          $stdout.should_receive(:puts).with("  #{red("✗")} Your ruby engine: mswin is currently unsupported\n    See more at https://shellycloud.com/documentation/requirements#ruby_versions")
           invoke(@main, :check)
         end
       end

data/spec/shelly/cloudfile_spec.rb

@@ -106,7 +106,7 @@ config
         FakeFS.deactivate!
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.1.0, 2.0.0, jruby, rbx, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:
@@ -138,7 +138,7 @@ config
         @cloudfile.thin = 2
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.1.0, 2.0.0, jruby, rbx, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.21
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development