shelly 0.2.15 → 0.2.16

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2U0NDkwODVjMjg1NGE3MGI1Y2QwYzc2MGVjMzFmYTQzMWYyMzkwYQ==
+  data.tar.gz: !binary |-
+    NDY3ZWEyNWNiMDVkNWViMjIxZDA3NTI0MjA2MjU2ZTU1OGRhOTdmYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzY5ZGRkNDcyMzdhNzk5OTcxNWU4ZmNlNjUxMWFhODQ4NzBlZjU4MWUyZWYw
+    NGI1NmFkYTI4MzU0ZTc1YTQ2Njc0NTBhZmZmYTc5MjkzNjZiZDA5ZWI2NzY3
+    ZmI3NzM1OTJkYWIyMWEzYzYyZjExNGI4MjEzNTQwZjhmOWM3ZDg=
+  data.tar.gz: !binary |-
+    Y2FlNjgyMDRhMWI1Mzk5Njg2MDZmZjA2YmE5M2U2M2VhZWVmYmUxNzdiMjkz
+    MTczNjZiZDUzNTM4OWUyOTI4NTBhNTU0MjBlY2ZiMWNhNzcyMTVhY2FkOTY0
+    NGFiNzZjNmVmMzQ4ZTdlYTI5M2ExZTA2MTk3OTczYTFhNGU4YjA=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.16 / 2013-04-04
+
+* [bug] `shelly add` now properly sets puma as web server when run under JRuby
+* [bug] `shelly add` now properly sets jruby as ruby_version when run under JRuby
+
 ## 0.2.15 / 2013-03-28
 
 * [feature] `shelly files list [PATH]` lists files from cloud's disk

data/lib/shelly/app.rb

@@ -17,6 +17,14 @@ module Shelly
       self.content = content
     end
 
+    def thin
+      size == "small" ? 2 : 4
+    end
+
+    def puma
+      size == "small" ? 1 : 2
+    end
+
     def databases=(dbs)
       @databases = dbs - ['none']
     end
@@ -48,10 +56,7 @@ module Shelly
                     :organization_name => organization,
                     :zone_name => zone_name}
       response = shelly.create_app(attributes)
-      self.git_url = response["git_url"]
-      self.domains = response["domains"]
-      self.ruby_version = response["ruby_version"]
-      self.environment = response["environment"]
+      assign_attributes(response)
     end
 
     def create_cloudfile
@@ -61,6 +66,11 @@ module Shelly
       cloudfile.environment = environment
       cloudfile.domains = domains
       cloudfile.size = size
+      if ruby_version == 'jruby'
+        cloudfile.puma = puma
+      else
+        cloudfile.thin = thin
+      end
       cloudfile.databases = databases
       cloudfile.create
     end
@@ -293,6 +303,17 @@ module Shelly
 
     private
 
+    def assign_attributes(response)
+      self.git_url = response["git_url"]
+      self.domains = response["domains"]
+      self.ruby_version = jruby? ? 'jruby' : response["ruby_version"]
+      self.environment = response["environment"]
+    end
+
+    def jruby?
+      RUBY_PLATFORM == 'java'
+    end
+
     # Internal: Checks if specified option is present in Cloudfile
     def option?(option)
       content["servers"].any? {|_, settings| settings.has_key?(option)}

data/lib/shelly/cloudfile.rb

@@ -5,7 +5,7 @@ module Shelly
     attr_accessor :content
     # Cloudfile attributes used for generating Cloudfile from a template
     attr_accessor :code_name, :ruby_version, :environment, :domains,
-      :databases, :size
+      :databases, :size, :thin, :puma
 
     # Public: Return true if Cloudfile is present in current directory
     def present?
@@ -25,7 +25,6 @@ module Shelly
     # Returns the generated Cloudfile as String
     def generate
       @email = current_user.email
-      @thin = @size == "small" ? 2 : 4
       template = File.read(template_path)
       cloudfile = ERB.new(template, nil, "%<>-")
       cloudfile.result(binding)

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby_version: <%= @ruby_version %> # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: <%= @ruby_version %> # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
   environment: <%= @environment %> # RAILS_ENV
   monitoring_email: <%= @email %>
   domains:
@@ -13,7 +13,12 @@
   servers:
     app1:
       size: <%= @size %>
+      <%- if @thin -%>
       thin: <%= @thin %>
+      <%- end -%>
+      <%- if @puma -%>
+      puma: <%= @puma %>
+      <%- end -%>
       # whenever: on
       # delayed_job: 1
       databases:

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -280,12 +280,21 @@ describe Shelly::App do
     it "should assign returned git_url, domains, ruby_version and environment" do
       @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
         "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
+      stub_const('RUBY_PLATFORM', 'i686-linux')
       @app.create
       @app.git_url.should == "git@git.example.com:fooo.git"
       @app.domains.should == ["fooo.shellyapp.com"]
       @app.ruby_version.should == "1.9.2"
       @app.environment.should == "production"
     end
+
+    it "should assign jruby as ruby_version if gem is running under jruby" do
+      @client.stub(:create_app).and_return("git_url" => nil,
+        "domains" => nil, "environment" => nil, "ruby_version" => "1.9.2")
+      stub_const('RUBY_PLATFORM', 'java')
+      @app.create
+      @app.ruby_version.should == "jruby"
+    end
   end
 
   describe "#redeploy" do
@@ -386,21 +395,35 @@ describe Shelly::App do
   end
 
   describe "#create_cloudfile" do
-    it "should create cloudfile with app attributes" do
-      @app.ruby_version = "1.9.3"
+    before do
       @app.environment = "production"
       @app.domains = ["example.com", "another.example.com"]
       @app.size = "large"
       @app.databases = []
-      cloudfile = mock
-      cloudfile.should_receive(:code_name=).with("foo-staging")
-      cloudfile.should_receive(:ruby_version=).with("1.9.3")
-      cloudfile.should_receive(:environment=).with("production")
-      cloudfile.should_receive(:domains=).with(["example.com", "another.example.com"])
-      cloudfile.should_receive(:size=).with("large")
-      cloudfile.should_receive(:databases=).with([])
-      cloudfile.should_receive(:create)
-      Shelly::Cloudfile.should_receive(:new).and_return(cloudfile)
+      @cloudfile = mock(:code_name= => nil, :ruby_version= => nil,
+        :environment= => nil, :domains= => nil, :size= => nil, :thin= => nil,
+        :puma= => nil, :databases= => nil, :create => nil)
+      Shelly::Cloudfile.should_receive(:new).and_return(@cloudfile)
+    end
+
+    it "should create cloudfile with app attributes" do
+      @app.ruby_version = "1.9.3"
+      @cloudfile.should_receive(:code_name=).with("foo-staging")
+      @cloudfile.should_receive(:ruby_version=).with("1.9.3")
+      @cloudfile.should_receive(:environment=).with("production")
+      @cloudfile.should_receive(:domains=).with(["example.com", "another.example.com"])
+      @cloudfile.should_receive(:size=).with("large")
+      @cloudfile.should_receive(:thin=).with(4)
+      @cloudfile.should_not_receive(:puma=)
+      @cloudfile.should_receive(:databases=).with([])
+      @cloudfile.should_receive(:create)
+      @app.create_cloudfile
+    end
+
+    it "should set puma instead of thin under jruby" do
+      @app.ruby_version = "jruby"
+      @cloudfile.should_not_receive(:thin=)
+      @cloudfile.should_receive(:puma=).with(2)
       @app.create_cloudfile
     end
   end

data/spec/shelly/cloudfile_spec.rb

@@ -101,6 +101,7 @@ config
       @cloudfile.ruby_version = "1.9.3"
       @cloudfile.environment = "production"
       @cloudfile.size = "large"
+      @cloudfile.thin = 4
       @cloudfile.stub(:current_user => mock(:email => "bob@example.com"))
     end
 
@@ -109,7 +110,7 @@ config
         FakeFS.deactivate!
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:
@@ -135,9 +136,10 @@ config
       it "should generate sample Cloudfile with given attributes and 2 thins" do
         FakeFS.deactivate!
         @cloudfile.size = "small"
+        @cloudfile.thin = 2
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.0.0, jruby, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:

metadata

@@ -1,236 +1,179 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-04 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
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
+  name: simplecov
   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: 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'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -305,47 +248,25 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shelly Cloud command line tool
-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
+test_files: []