shelly 0.2.7 → 0.2.8

data/CHANGELOG.md

@@ -1,8 +1,12 @@
+## 0.2.8 / 2013-03-12
+
+* Requires newer version of wijet-thor
+
 ## 0.2.7 / 2013-03-07
 
 * [bug] Checking presence of Rakefile and tasks (db:migrate and db:setup)
 
-## 0.2.6 / 2013-03-06
+## 0.2.6 / 2013-03-06 yanked
 
 * [bug] Fixes issues with newer version of Thor gem (> 0.15.0)
 

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in shelly.gemspec
 gemspec

data/lib/shelly/app.rb

@@ -10,7 +10,7 @@ module Shelly
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
       :git_url, :domains, :web_server_ip, :size, :thin, :redeem_code,
-      :content, :organization
+      :content, :organization, :zone_name
 
     def initialize(code_name = nil, content = nil)
       self.code_name = code_name
@@ -45,7 +45,8 @@ module Shelly
     def create
       attributes = {:code_name => code_name,
                     :redeem_code => redeem_code,
-                    :organization_name => organization}
+                    :organization_name => organization,
+                    :zone_name => zone_name}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
       self.domains = response["domains"]

data/lib/shelly/cli/main.rb

@@ -85,6 +85,8 @@ module Shelly
         :desc => "Add cloud to existing organization"
       method_option "skip-requirements-check", :type => :boolean,
         :desc => "Skip Shelly Cloud requirements check"
+      method_option "zone", :type => :boolean, :hide => true,
+        :desc => "Create cloud in given zone"
       desc "add", "Add a new cloud"
       def add
         check_options(options)
@@ -97,6 +99,7 @@ module Shelly
         app.size = options["size"] || "large"
         app.redeem_code = options["redeem-code"]
         app.organization = options["organization"] || ask_for_organization(app.code_name)
+        app.zone_name = options["zone"]
         app.create
 
         if overwrite_remote?(app)

data/lib/shelly/client.rb

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

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/thor/options.rb

@@ -15,10 +15,3 @@ class Thor
     end
   end
 end
-
-
- def check_unknown!
-      raise UnknownArgumentError, "shelly: unrecognized option '#{@unknown.join(', ')}'\n" +
-        "Usage: shelly [COMMAND]... [OPTIONS]\n" +
-        "Try 'shelly --help' for more information" unless @unknown.empty?
-    end

data/shelly.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency "fakefs"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
+  s.add_runtime_dependency "wijet-thor", "~> 0.14.9"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "progressbar"

data/spec/shelly/app_spec.rb

@@ -267,7 +267,8 @@ describe Shelly::App do
       attributes = {
         :code_name => "fooo",
         :redeem_code => "foo123",
-        :organization_name => nil
+        :organization_name => nil,
+        :zone_name => 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

@@ -347,6 +347,14 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           @main.options = {"code-name" => "foo", "databases" => ["postgresql"], "size" => "large"}
           invoke(@main, :add)
         end
+
+        it "should use zone from option" do
+          @app.should_receive(:zone_name=).with('eu1')
+          @main.options = {"zone" => "eu1"}
+          fake_stdin(["mycodename", ""]) do
+            invoke(@main, :add)
+          end
+        end
       end
     end
 

data/spec/shelly/client_spec.rb

@@ -165,15 +165,17 @@ 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 => nil)
+      @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
+        :ruby_version => "1.9.2"}, :organization_name => nil, :zone_name => nil)
       @client.create_app(:code_name => "foo", :ruby_version => "1.9.2")
     end
 
     it "should send post with app's attributes and organization name" do
-      @client.should_receive(:post).with("/apps", :app => {:code_name => "foo", :ruby_version => "1.9.2"}, :organization_name => "foo")
-      @client.create_app(:code_name => "foo", :ruby_version => "1.9.2", :organization_name => "foo")
+      @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
+        :ruby_version => "1.9.2"}, :organization_name => "foo", :zone_name => 'eu1')
+      @client.create_app(:code_name => "foo", :ruby_version => "1.9.2",
+        :organization_name => "foo", :zone_name => "eu1")
     end
-
   end
 
   describe "#organizations" do

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ if ENV["COVERAGE"]
   SimpleCov.start
 end
 
+# Psych is required here to make sure it will be used as default
+# yaml engine when running tests (required by cloudfile_spec:49)
+require 'psych' if RUBY_VERSION >= "1.9"
 require "rspec"
 require "shelly"
 require "helpers"
@@ -10,7 +13,6 @@ require "input_faker"
 require "fakefs/spec_helpers"
 require "fakeweb"
 require "launchy"
-require "rake"
 
 ENV['THOR_COLUMNS'] = "180"
 FakeWeb.allow_net_connect = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -91,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.7
+        version: 0.14.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.7
+        version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -626297834617784665
+      hash: -3129673927878389756
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,11 +326,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -626297834617784665
+      hash: -3129673927878389756
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 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