shelly 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2YwOTIzMzE5M2NiZWVkMTEwMWY5YWYxYjdjZThkMTNhODJhNTUzYw==
+    ZGJlZjY2MmJjZjJmNWNhYjgyODg3NjA2ODNhYzk2NzRmMjY0NzdjOQ==
   data.tar.gz: !binary |-
-    Nzg1NGJjZWRmYmE4ZjEwOGY1MzI0MGVjZTI3ZGEzY2Q4NDhlM2RjYg==
+    MTNmY2VkZWUyMjhmYzU5MTFhZDRkYTNjMmM2ZTRiNGJkNzY4NWJhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDY4OWM4MDExNWJmMTI4ZWJiODE0MzRmZDY0ZmI2ZDgyMzMxZjZhZTczOTY4
-    MjQ0ZDU1Y2Y2NzZmM2VlMjU2ZjlhOTQ5MWQ1M2MwOTQ2YTU3ZDdlOGQ3MmU5
-    NWNkNDQ2NmM5YzRmYjRhMTQwMjNhNzg5ODZmYWFhM2Q0Yjk4NDA=
+    YmU2NzhkNWJkYzNlMjMwNGFjMGIxN2ZhNWI0YTdlZjk3ZjVlOTk3M2I3MWNm
+    OTMxZDNlMWFjN2FlODQ2MTgxMWU4MDFkYmNkZDIyYjdhODhhMGFiNDkxODcy
+    YzMwYjVlZmQyZjk0MzNmYWQxYTRkNWIzNTZhYmQ1YzgwNzQ1NTA=
   data.tar.gz: !binary |-
-    YzJiNWY1ZmViNzI1OWZlY2E5MDMwYzExNjVhMDA1Y2QzZTA2Yzg0NTBkYTA3
-    ZjBlM2MyZDhiM2I4NzVhMzQ3ZjIxYTgwMTc5MjA0OWJjNjJiODEwZDc1NTVh
-    OTE1NTA3NDBhNWM5NzYxNTllZjViOGI2ODIyYjlkODc1NWYwNWE=
+    ODdmZjg1NzcyNzI0YWE5ODI1MDc1MWE0MmVhYmRhNTI3YjJjMDA5OTgxMWNk
+    Njc5YjRkYWRmNmI3NDU5Y2Y5OWViOTMzOGZiNzBiYTFmNTQ3ZjFkNjFjZTI0
+    YjIyMjY4ZjgwZWI2NjJmNDk5Njg0YzExOTQyNWE1NzlkMjk0N2E=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.1 / 2013-08-26
+
+* [feature] Upload existing config file with `shelly config upload PATH`
+* [improvement] Reorganised displaying deploy logs
+* [improvement] Show next action depending on cloud state when adding configuration file
+
 ## 0.4.0 / 2013-08-13
 
 * [feature] Added `shelly organization add` to create new organizations

data/lib/shelly/app.rb

@@ -191,6 +191,10 @@ module Shelly
       shelly.app_delete_config(code_name, path)
     end
 
+    def config_exists?(path)
+      configs.any? { |config| config["path"] == path }
+    end
+
     def rake(task)
       ssh(:command => "rake_runner \"#{task}\"")
     end
@@ -243,6 +247,10 @@ module Shelly
       system("git status > /dev/null 2>&1")
     end
 
+    def turned_off?
+      state == 'turned_off'
+    end
+
     def to_s
       code_name
     end

data/lib/shelly/cli/config.rb

@@ -6,8 +6,10 @@ module Shelly
       namespace :config
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :show, :create, :new, :edit, :update, :delete]
-      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      before_hook :logged_in?, :only => [:list, :show, :create, :new, :edit,
+        :update, :upload, :delete]
+      class_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify cloud"
 
       desc "list", "List configuration files"
       def list
@@ -51,8 +53,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "create #{path}")
         app.create_config(path, output)
         say "File '#{path}' created.", :green
-        say "To make changes to running application redeploy it using:"
-        say "`shelly redeploy --cloud #{app}`"
+        next_action_info(app)
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         exit 1
@@ -67,8 +68,7 @@ module Shelly
         content = open_editor(config["path"], config["content"])
         app.update_config(path, content)
         say "File '#{config["path"]}' updated.", :green
-        say "To make changes to running application redeploy it using:"
-        say "`shelly redeploy --cloud #{app}`"
+        next_action_info(app)
       rescue Client::NotFoundException => e
         raise unless e.resource == :config
         say_error "Config '#{path}' not found", :with_exit => false
@@ -84,8 +84,7 @@ module Shelly
         if yes?("Are you sure you want to delete '#{path}' (yes/no):")
           app.delete_config(path)
           say "File '#{path}' deleted.", :green
-          say "To make changes to running application redeploy it using:"
-          say "`shelly redeploy --cloud #{app}`"
+          next_action_info(app)
         else
           say "File not deleted"
         end
@@ -95,7 +94,46 @@ module Shelly
         say_error "You can list available config files with `shelly config list --cloud #{app}`"
       end
 
+      desc "upload PATH [DESTINATION_PATH]", "Upload configuration file"
+      long_desc %{
+        Upload configuration file from local machine
+        PATH - Path to configuration file that will be uploaded
+        DESTINATION_PATH - Optional file path that file will be uploaded to. By default it's the same as PATH.
+      }
+      def upload(path, destination_path = nil)
+        app = multiple_clouds(options[:cloud], "config upload #{path}")
+        destination_path ||= path
+        if ::File.exists?(path)
+          content = ::File.read(path)
+        else
+          say_error "File '#{path}' doesn't exist."
+        end
+        if app.config_exists?(destination_path)
+          if yes?("Config file '#{destination_path}' exists, do you want to overwrite it (yes/no):")
+            app.update_config(destination_path, content)
+            say "File '#{path}' uploaded.", :green
+            next_action_info(app)
+          else
+            say "File not overwritten."
+          end
+        else
+          app.create_config(destination_path, content)
+          say "File '#{path}' uploaded.", :green
+          next_action_info(app)
+        end
+      end
+
       no_tasks do
+        def next_action_info(app)
+          if app.turned_off?
+            say "Changes will take affect when cloud is started"
+            say "`shelly start --cloud #{app}`"
+          else
+            say "To make changes to running cloud redeploy it using:"
+            say "`shelly redeploy --cloud #{app}`"
+          end
+        end
+
         def print_configs(configs)
           print_table(configs.map { |config|
             [" * ", config["path"]] })

data/lib/shelly/cli/deploy.rb

@@ -43,12 +43,6 @@ module Shelly
           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
@@ -61,6 +55,12 @@ module Shelly
           if content["puma_restart"]
             say("Starting puma", :green); say(content["puma_restart"])
           end
+          if content["callbacks"]
+            say("Starting callbacks", :green); say(content["callbacks"])
+          end
+          if content["whenever"]
+            say("Starting whenever", :green); say(content["whenever"])
+          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")

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/shelly/app_spec.rb

@@ -97,6 +97,20 @@ describe Shelly::App do
       @client.should_receive(:app_delete_config).with("foo-staging", "path")
       @app.delete_config("path")
     end
+
+    describe "#config_exists?" do
+      before do
+        @client.stub(:app_configs => config_response)
+      end
+
+      it "should return true when config exists" do
+        @app.config_exists?("user_created").should be_true
+      end
+
+      it "should return false when config doesn't exist" do
+        @app.config_exists?("some/config").should be_false
+      end
+    end
   end
 
   describe "#attributes" do
@@ -185,6 +199,13 @@ describe Shelly::App do
     end
   end
 
+  describe "#turned_off?" do
+    it "should return true if cloud state is turned_off" do
+      @client.should_receive(:app).and_return({'state' => 'turned_off'})
+      @app.turned_off?.should be_true
+    end
+  end
+
   describe "#deploy_logs" do
     it "should list deploy_logs" do
       @client.should_receive(:deploy_logs).with("foo-staging")

data/spec/shelly/cli/config_spec.rb

@@ -14,6 +14,7 @@ describe Shelly::CLI::Config do
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
     @client.stub(:authorize!)
+    @client.stub(:app).and_return('state' => 'running')
     File.open("Cloudfile", 'w') {|f| f.write("foo-production:\n") }
     FileUtils.mkdir_p("/tmp")
     Dir.stub(:tmpdir).and_return("/tmp")
@@ -96,7 +97,6 @@ describe Shelly::CLI::Config do
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
       @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
-      @app = Shelly::App.new("foo-production")
       Shelly::App.stub(:new).and_return(@app)
       @client.should_receive(:app_create_config).with("foo-production", "path", "\n").and_return({})
       @config.should_receive(:multiple_clouds).and_return(@app)
@@ -109,13 +109,27 @@ describe Shelly::CLI::Config do
       lambda { invoke(@config, :create, "path") }.should raise_error(SystemExit)
     end
 
-    it "should create file" do
-      @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
-      @client.should_receive(:app_create_config).with("foo-production", "path", "\n").and_return({})
-      $stdout.should_receive(:puts).with(green "File 'path' created.")
-      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
-      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
-      invoke(@config, :create, "path")
+    context "cloud running" do
+      it "should create file" do
+        @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+        @client.should_receive(:app_create_config).with("foo-production", "path", "\n").and_return({})
+        $stdout.should_receive(:puts).with(green "File 'path' created.")
+        $stdout.should_receive(:puts).with("To make changes to running cloud redeploy it using:")
+        $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
+        invoke(@config, :create, "path")
+      end
+    end
+
+    context "cloud turned off" do
+      it "should print " do
+        @client.stub(:app).and_return('state' => 'turned_off')
+        @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+        @client.should_receive(:app_create_config).with("foo-production", "path", "\n").and_return({})
+        $stdout.should_receive(:puts).with(green "File 'path' created.")
+        $stdout.should_receive(:puts).with("Changes will take affect when cloud is started")
+        $stdout.should_receive(:puts).with("`shelly start --cloud foo-production`")
+        invoke(@config, :create, "path")
+      end
     end
 
     context "on validation errors" do
@@ -162,8 +176,7 @@ describe Shelly::CLI::Config do
       @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
       @client.should_receive(:app_update_config).with("foo-production", "path", "example content\n").and_return({"path" => "test.rb", "content" => "example content"})
       $stdout.should_receive(:puts).with(green "File 'test.rb' updated.")
-      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
-      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
+      @config.should_receive(:next_action_info)
       invoke(@config, :edit, "path")
     end
 
@@ -211,8 +224,7 @@ describe Shelly::CLI::Config do
       @client.should_receive(:app_delete_config).with("foo-production", "some-path").and_return({})
       $stdout.should_receive(:print).with("Are you sure you want to delete 'some-path' (yes/no): ")
       $stdout.should_receive(:puts).with(green "File 'some-path' deleted.")
-      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
-      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
+      @config.should_receive(:next_action_info)
       fake_stdin(["y"]) do
         invoke(@config, :delete, "some-path")
       end
@@ -242,4 +254,53 @@ describe Shelly::CLI::Config do
       end
     end
   end
+
+  describe "#upload" do
+    before do
+      @config.stub(:multiple_clouds => @app)
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@config, :upload).should include(:logged_in?)
+    end
+
+    it "should upload given configuration file" do
+      File.open("upload_me", "w") { |f| f << "upload_me_content" }
+      @app.stub(:config_exists? => false)
+      @app.should_receive(:create_config).with("upload_me", "upload_me_content").and_return({})
+      $stdout.should_receive(:puts).with(green "File 'upload_me' uploaded.")
+      invoke(@config, :upload, "upload_me")
+    end
+
+    context "when destination path given" do
+      it "should upload to given path" do
+        File.open("upload_me", "w") { |f| f << "upload_me_content" }
+        @app.stub(:config_exists? => false)
+        @app.should_receive(:create_config).with("put/it/here", "upload_me_content").and_return({})
+        $stdout.should_receive(:puts).with(green "File 'upload_me' uploaded.")
+        invoke(@config, :upload, "upload_me", "put/it/here")
+      end
+    end
+
+    context "when source path doesn't exist" do
+      it "should show error" do
+        @app.stub(:config_exists? => false)
+        @app.should_not_receive(:create_config)
+        $stdout.should_receive(:puts).with(red "File 'upload_me' doesn't exist.")
+        lambda { invoke(@config, :upload, "upload_me") }.should raise_error(SystemExit)
+      end
+    end
+
+    context "when destination path exists" do
+      it "should ask if overwrite" do
+        File.open("upload_me", "w") { |f| f << "upload_me_content" }
+        @app.stub(:config_exists? => true)
+        @app.should_receive(:update_config).with("upload_me", "upload_me_content").and_return({})
+        $stdout.should_receive(:puts).with(green "File 'upload_me' uploaded.")
+        fake_stdin(["y"]) do
+          invoke(@config, :upload, "upload_me")
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec