shelly 0.1.40 → 0.2.0

data/.travis.yml

@@ -3,3 +3,5 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
+  - jruby-18mode
+  - jruby-19mode

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.1.39 / 2013-01-08
+## 0.2.0 / 2013-01-10
+
+* [feature] shelly now works on JRuby
+* [feature] only valid YAML is accepted in Cloudfiles
+* [feature] shelly-dependencies is no longer a dependency, add thin to Gemfile separately
+
+## 0.1.40 / 2013-01-08
 
 * [improvement] `shelly deploys pending` fetches references from origin before displaying the list of commits.
 

data/lib/shelly.rb

@@ -4,9 +4,6 @@ require "core_ext/hash"
 require "core_ext/string"
 
 require "yaml"
-if YAML.const_defined?(:ENGINE)
-  YAML::ENGINE.yamler = 'syck'
-end
 
 require "shelly/helpers"
 require "shelly/model"

data/lib/shelly/cli/main.rb

@@ -414,10 +414,6 @@ We have been notified about it. We will be adding new resources shortly}
         print_check(structure.gem?("thin"), "Gem 'thin' is present",
           "Gem 'thin' is missing in the Gemfile", :show_fulfilled => verbose)
 
-        print_check(structure.gem?("rake"), "Gem 'rake' is present",
-          "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
-
-
         print_check(structure.gem?("rake"), "Gem 'rake' is present",
           "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
 

data/lib/shelly/cloudfile.rb

@@ -27,7 +27,7 @@ module Shelly
       @email = current_user.email
       @thin = @size == "small" ? 2 : 4
       template = File.read(template_path)
-      cloudfile = ERB.new(template, 0, "%<>-")
+      cloudfile = ERB.new(template, nil, "%<>-")
       cloudfile.result(binding)
     end
 
@@ -41,6 +41,20 @@ module Shelly
     def content
       return unless present?
       @content ||= YAML.load(File.open(path))
+    rescue Psych::SyntaxError => e
+      # Using $stdout.puts so that it can be stubbed out on jruby.
+      $stdout.puts "Your Cloudfile has invalid YAML syntax."
+      $stdout.puts "You are seeing this message because we stopped supporting invalid YAML that was allowed in Ruby 1.8."
+      $stdout.puts ""
+      $stdout.puts "The most likely reason is a string starting with '*' in the domains array. The solution is to surround such strings with quotes, e.g.:"
+      $stdout.puts "domains:"
+      $stdout.puts "  - \"*.example.com\""
+      $stdout.puts ""
+      $stdout.puts "The original YAML error message was:"
+      $stdout.puts "  #{e.message}"
+      $stdout.puts ""
+      $stdout.puts "If you need any assistance, feel free to contact support@shellycloud.com"
+      exit 1
     end
 
     # Internal: Path to Cloudfile in current directory

data/lib/shelly/structure_validator.rb

@@ -1,4 +1,3 @@
-require 'grit'
 require 'bundler'
 
 module Shelly
@@ -52,12 +51,9 @@ module Shelly
 
     def repo_paths
       @repo_paths ||= begin
-        repo = Grit::Repo.new(".")
-        # Select files from repo which are unchanged, added or modified
-        # and then return their paths
-        repo.status.files.map(&:last).select { |status|
-          status.type.nil? || status.type == 'A' || status.type == 'M'
-        }.map(&:path)
+        files = `git ls-files`.split("\n")
+        deleted_files = `git ls-files -d`.split("\n")
+        files - deleted_files
       end
     end
   end

data/lib/shelly/templates/Cloudfile.erb

@@ -4,8 +4,12 @@
   monitoring_email: <%= @email %>
   domains:
     <%- @domains.each do |domain| -%>
+    <%- if domain.start_with?("*") -%>
+    - "<%= domain %>"
+    <%- else -%>
     - <%= domain %>
     <%- end -%>
+    <%- end -%>
   servers:
     app1:
       size: <%= @size %>

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.40"
+  VERSION = "0.2.0"
 end

data/shelly.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "progressbar"
-  s.add_runtime_dependency "grit"
   s.add_runtime_dependency "launchy"
-  s.add_runtime_dependency "shelly-dependencies", "~> 0.2.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/shelly/cli/main_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require "spec_helper"
 require "shelly/cli/main"
-require "grit"
 
 describe Shelly::CLI::Main do
   before do

data/spec/shelly/cloudfile_spec.rb

@@ -10,17 +10,6 @@ describe Shelly::Cloudfile do
     @cloudfile = Shelly::Cloudfile.new
   end
 
-  it "should allow improper yaml that works with syck" do
-    yaml = %Q{domains:
-  - *.example.com
-  - example.com
-    }
-    expect {
-      yaml = YAML.load(yaml)
-    }.to_not raise_error
-    yaml.should == {"domains" => ["*.example.com", "example.com"]}
-  end
-
   describe "#content" do
     it "should fetch and parse file content" do
       content = <<-config
@@ -55,6 +44,27 @@ config
            }
          }
     end
+
+    if RUBY_VERSION >= "1.9"
+      it "prints error and quits when 1.9 incompatible syntax is used" do
+        $stdout.stub(:puts)
+
+        content = <<-config
+foo-staging:
+  domains:
+    - foo-staging.winniecloud.com
+    - *.foo-staging.com
+        config
+
+        File.open("/projects/foo/Cloudfile", "w") { |f| f << content }
+
+        $stdout.should_receive(:puts).with("Your Cloudfile has invalid YAML syntax.")
+
+        expect {
+          @cloudfile.content
+        }.to raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#clouds" do
@@ -86,7 +96,7 @@ config
   describe "#generate" do
     before do
       @cloudfile.code_name = "foo-staging"
-      @cloudfile.domains = ["foo-staging.winniecloud.com", "foo.example.com"]
+      @cloudfile.domains = ["foo-staging.winniecloud.com", "*.foo.example.com"]
       @cloudfile.databases = ["postgresql", "mongodb"]
       @cloudfile.ruby_version = "1.9.3"
       @cloudfile.environment = "production"
@@ -104,7 +114,7 @@ foo-staging:
   monitoring_email: bob@example.com
   domains:
     - foo-staging.winniecloud.com
-    - foo.example.com
+    - "*.foo.example.com"
   servers:
     app1:
       size: large
@@ -132,7 +142,7 @@ foo-staging:
   monitoring_email: bob@example.com
   domains:
     - foo-staging.winniecloud.com
-    - foo.example.com
+    - "*.foo.example.com"
   servers:
     app1:
       size: small

data/spec/shelly/structure_validator_spec.rb

@@ -3,10 +3,7 @@ require "spec_helper"
 describe Shelly::StructureValidator do
   before do
     @validator = Shelly::StructureValidator.new
-    statuses = [mock(:type => nil, :path => "Gemfile"),
-      mock(:type => nil, :path => "Gemfile.lock"),
-      mock(:type => nil, :path => "config.ru")]
-    Grit::Repo.stub_chain(:new, :status, :files, :map => statuses)
+    @validator.stub(:repo_paths => ["Gemfile", "Gemfile.lock", "config.ru"])
   end
 
   describe "#gemfile?" do
@@ -18,9 +15,7 @@ describe Shelly::StructureValidator do
 
     context "when Gemfile doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status, :files,
-          :map => [mock(:type => 'D', :path => "Gemfile"),
-            mock(:type => nil, :path => "Gemfile.lock")])
+        @validator.stub(:repo_paths => ["Gemfile.lock"])
         @validator.gemfile?.should == false
       end
     end
@@ -35,9 +30,7 @@ describe Shelly::StructureValidator do
 
     context "when Gemfile.lock doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status, :files,
-          :map => [mock(:type => nil, :path => "Gemfile"),
-            mock(:type => 'D' , :path => "Gemfile.lock")])
+        @validator.stub(:repo_paths => ["Gemfile"])
         @validator.gemfile_lock?.should == false
       end
     end
@@ -52,7 +45,7 @@ describe Shelly::StructureValidator do
 
     context "when config.ru doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status, :files, :map => [])
+        @validator.stub(:repo_paths => ["Gemfile.lock"])
         @validator.config_ru?.should == false
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -219,22 +219,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: grit
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -251,22 +235,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shelly-dependencies
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -349,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2056349295390869621
+      hash: -2034292821512918677
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2056349295390869621
+      hash: -2034292821512918677
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24