shelly 0.4.37 → 0.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8cae11e143cf0b16eed1f5fb61648b887b0f549
-  data.tar.gz: 8f652dc1ed1c0dc2b7e94294e3cc4dd4c8155eac
+  metadata.gz: a378b3163f2759b50c3527162a36a2e448aaa0a2
+  data.tar.gz: e51cc9e70dc529e7ebf7e1b638dd7972afc4a94c
 SHA512:
-  metadata.gz: d9d71e7c7ffa22775081bbece8f2322d4fd7c831fb3dae334763b68367a4fe4278328fea24546c8a01f53dddd7c6bea496e02e13870c39ff03ba1bf76f6d16da
-  data.tar.gz: f6b3271721e16360b342e123cdcf01bf6c5f015c8064c7338b744a725e48371caa7130b134847ffaa81937c7b0655b7a62d8ba6158e2b1735294ff536b200ab8
+  metadata.gz: 65b56e13341eb0e9ae7a8ed219c9537ab43d96c78b9c7e98ac9cb1f6c1d1d38752cc7f843b3105bbd30a5212aa95d236e97706be858c4af4ae0d23e577aeb0db
+  data.tar.gz: 605a7ea1cd53db41017d14f98432c793ac332983911425b325fed46885ebe8029860523070f487c40f61c84b480f68ccca80f18d3d52a17ac165b73ce6a0c43a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.38 / 2014-10-20
+
+* [improvement] Deployment logs procesess moved after puma
+* [improvement] User is able to choose zone while creating new cloud
+
 ## 0.4.37 / 2014-09-01
 
 * [bugfix] print user-friendly message if user tries to finish maintenance, but

data/lib/shelly/app.rb

@@ -14,7 +14,7 @@ module Shelly
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
       :git_url, :domains, :web_server_ip, :size, :thin,
-      :organization_name, :zone_name, :usage, :traffic
+      :organization_name, :zone, :usage, :traffic
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -71,7 +71,7 @@ module Shelly
     def create
       attributes = {:code_name => code_name,
                     :organization_name => organization_name,
-                    :zone_name => zone_name}
+                    :zone => zone}
       response = shelly.create_app(attributes)
       assign_attributes(response)
     end

data/lib/shelly/cli/deploy.rb

@@ -67,15 +67,15 @@ module Shelly
           if content["clockwork"]
             say("Starting clockwork", :green); say(content["clockwork"])
           end
-          if content["processes"]
-            say("Starting processes", :green); say(content["processes"])
-          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
+          if content["processes"]
+            say("Starting processes", :green); say(content["processes"])
+          end
           if content["after_restart"]
             say("After restart hook", :green); say(content["after_restart"])
           end

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

@@ -28,7 +28,7 @@ module Shelly
         app.databases = options["databases"] || ask_for_databases
         app.size = options["size"] || "small"
         app.organization_name = options["organization"] || ask_for_organization(options)
-        app.zone_name = options["zone"]
+        app.zone = options["zone"]
 
         app.create
         say "Cloud '#{app}' created in '#{app.organization_name}' organization", :green
@@ -54,6 +54,8 @@ module Shelly
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud(git_remote)
 
+      rescue Client::ConflictException => e
+        say_error e[:error]
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         say_new_line

data/lib/shelly/client/apps.rb

@@ -1,9 +1,9 @@
 class Shelly::Client
   def create_app(attributes)
     organization = attributes.delete(:organization_name)
-    zone = attributes.delete(:zone_name)
+    zone = attributes.delete(:zone)
     post("/apps", :app => attributes, :organization_name => organization,
-           :zone_name => zone)
+           :zone => zone)
   end
 
   def delete_app(code_name)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.37"
+  VERSION = "0.4.38"
 end

data/spec/shelly/app_spec.rb

@@ -356,7 +356,7 @@ describe Shelly::App do
       attributes = {
         :code_name => "fooo",
         :organization_name => nil,
-        :zone_name => nil
+        :zone => nil
       }
       @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
         "domains" => %w(fooo.shellyapp.com))

data/spec/shelly/cli/main_spec.rb

@@ -371,7 +371,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         end
 
         it "should use zone from option" do
-          @app.should_receive(:zone_name=).with('eu1')
+          @app.should_receive(:zone=).with('eu1')
           @main.options = {"zone" => "eu1"}
           fake_stdin(["mycodename", ""]) do
             invoke(@main, :add)
@@ -588,6 +588,18 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       end.to raise_error(SystemExit)
     end
 
+    it "should show conflict exception" do
+      exception = Shelly::Client::ConflictException.new({'error' => 'message'})
+      @app.should_receive(:create).and_raise(exception)
+      $stdout.should_receive(:puts).with(red "message")
+
+      expect do
+        fake_stdin(["foo", "none"]) do
+          invoke(@main, :add)
+        end
+      end.to raise_error(SystemExit)
+    end
+
     context "organization" do
       before do
         @main.unstub(:ask_for_organization)

data/spec/shelly/client_spec.rb

@@ -171,9 +171,9 @@ describe Shelly::Client do
   describe "#create_app" do
     it "should send post with app's attributes" do
       @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
-        :ruby_version => "1.9.2"}, :organization_name => "foo", :zone_name => 'eu1')
+        :ruby_version => "1.9.2"}, :organization_name => "foo", :zone => 'eu1')
       @client.create_app(:code_name => "foo", :ruby_version => "1.9.2",
-        :organization_name => "foo", :zone_name => "eu1")
+        :organization_name => "foo", :zone => "eu1")
     end
   end
 

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.37
+  version: 0.4.38
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -242,8 +242,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -343,17 +343,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool