shelly 0.2.6.pre → 0.2.7

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.7 / 2013-03-07
+
+* [bug] Checking presence of Rakefile and tasks (db:migrate and db:setup)
+
+## 0.2.6 / 2013-03-06
+
 * [bug] Fixes issues with newer version of Thor gem (> 0.15.0)
 
 ## 0.2.5 / 2013-02-24

data/README.md

@@ -1,4 +1,4 @@
-# Shelly Cloud command line tool [![Build Status](https://secure.travis-ci.org/shellycloud/shelly.png?branch=master)](http://travis-ci.org/Ragnarson/shelly)
+# Shelly Cloud command line tool [![Build Status](https://secure.travis-ci.org/shellycloud/shelly.png?branch=master)](http://travis-ci.org/shellycloud/shelly)
 
 ## Installation
 

data/lib/shelly/cli/main.rb

@@ -419,8 +419,12 @@ Wait until cloud is in 'turned off' state and try again.}
           "Gemfile.lock is missing in git repository",
           :show_fulfilled => verbose)
 
-        print_check(structure.config_ru?, "File config.ru is present",
-          "File config.ru is missing",
+        print_check(structure.config_ru?, "config.ru is present",
+          "config.ru is missing",
+          :show_fulfilled => verbose)
+
+        print_check(structure.rakefile?, "Rakefile is present",
+          "Rakefile is missing",
           :show_fulfilled => verbose)
 
         print_check(structure.gem?("shelly-dependencies"),
@@ -434,6 +438,12 @@ Wait until cloud is in 'turned off' state and try again.}
         print_check(structure.gem?("rake"), "Gem 'rake' is present",
           "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
 
+        print_check(structure.task?("db:migrate"), "Task 'db:migrate' is present",
+          "Task 'db:migrate' is missing", :show_fulfilled => verbose)
+
+        print_check(structure.task?("db:setup"), "Task 'db:setup' is present",
+          "Task 'db:setup' is missing", :show_fulfilled => verbose)
+
         cloudfile = Cloudfile.new
         if cloudfile.present?
           cloudfile.clouds.each do |app|

data/lib/shelly/structure_validator.rb

@@ -19,14 +19,23 @@ module Shelly
       repo_paths.include?("config.ru")
     end
 
+    def rakefile?
+      repo_paths.include?("Rakefile")
+    end
+
     def gem?(name)
       gems.include?(name)
     end
 
+    def task?(name)
+      tasks.include?("rake #{name}")
+    end
+
     # Public: Check all requirements that app has to fulfill
     def valid?
       gemfile? && gemfile_lock? && gem?("thin") &&
-        gem?("rake") && config_ru?
+        gem?("rake") && config_ru? && rakefile? &&
+        task?("db:migrate") && task?("db:setup")
     end
 
     def invalid?
@@ -49,6 +58,11 @@ module Shelly
       @gems ||= definition.specs.map(&:name)
     end
 
+    def tasks
+      return [] unless rakefile?
+      @loaded_tasks ||= %x(rake -P).split("\n")
+    end
+
     def repo_paths
       @repo_paths ||= begin
         files = `git ls-files`.split("\n")

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby_version: <%= @ruby_version %> # 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: <%= @ruby_version %> # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
   environment: <%= @environment %> # RAILS_ENV
   monitoring_email: <%= @email %>
   domains:

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.6.pre"
+  VERSION = "0.2.7"
 end

data/scrolls/shellycloud.rb

@@ -39,12 +39,12 @@ after_everything do
   app_name.gsub!(/\W/, '') # only letters and numbers
   app_name.gsub!("_", "-")
 
-  instance_size = "large"
+  virtual_server_size = "large"
   if framework_env == "production"
-    say_custom "shellycloud", "Using large instances for production environment"
+    say_custom "shellycloud", "Using large virtual servers for production environment"
   else
-    say_custom "shellycloud", "Using small instances for staging environment"
-    instance_size = "small"
+    say_custom "shellycloud", "Using small virtual servers for staging environment"
+    virtual_server_size = "small"
   end
 
   code_name = "#{app_name}-#{framework_env}"
@@ -52,7 +52,7 @@ after_everything do
   name = File.basename(".")
   command =  "bundle exec shelly add --code_name #{code_name} "
   command += "--databases=#{selected_db} " if selected_db
-  command += "--size=#{instance_size}"
+  command += "--size=#{virtual_server_size}"
 
   run command
 

data/spec/shelly/cli/main_spec.rb

@@ -1425,7 +1425,8 @@ Wait until cloud is in 'turned off' state and try again.")
       Bundler::Definition.stub_chain(:build, :specs, :map) \
         .and_return(["thin", "pg", "delayed_job", "whenever", "sidekiq"])
       Shelly::StructureValidator.any_instance.stub(:repo_paths) \
-        .and_return(["config.ru", "Gemfile", "Gemfile.lock"])
+        .and_return(["config.ru", "Gemfile", "Gemfile.lock", "Rakefile"])
+      Shelly::StructureValidator.any_instance.stub(:tasks).and_return(["rake db:migrate"])
     end
 
     it "should ensure user is in git repository" do
@@ -1477,9 +1478,24 @@ Wait until cloud is in 'turned off' state and try again.")
       end
     end
 
+    context "when 'db:migrate' task exists" do
+      it "should show that necessary task exists" do
+        $stdout.should_receive(:puts).with("  #{green("✓")} Task 'db:migrate' is present")
+        invoke(@main, :check)
+      end
+    end
+
+    context "when 'db:migrate' task doesn't exist" do
+      it "should show that necessary task doesn't exist" do
+        Shelly::StructureValidator.any_instance.stub(:tasks).and_return([])
+        $stdout.should_receive(:puts).with("  #{red("✗")} Task 'db:migrate' is missing")
+        invoke(@main, :check)
+      end
+    end
+
     context "when config.ru exists" do
       it "should show that config.ru exists" do
-        $stdout.should_receive(:puts).with("  #{green("✓")} File config.ru is present")
+        $stdout.should_receive(:puts).with("  #{green("✓")} config.ru is present")
         invoke(@main, :check)
       end
     end
@@ -1487,7 +1503,22 @@ Wait until cloud is in 'turned off' state and try again.")
     context "when config.ru doesn't exist" do
       it "should show that config.ru is neccessary" do
         Shelly::StructureValidator.any_instance.stub(:repo_paths).and_return([])
-        $stdout.should_receive(:puts).with("  #{red("✗")} File config.ru is missing")
+        $stdout.should_receive(:puts).with("  #{red("✗")} config.ru is missing")
+        invoke(@main, :check)
+      end
+    end
+
+    context "when Rakefile exists" do
+      it "should show that Rakefile exists" do
+        $stdout.should_receive(:puts).with("  #{green("✓")} Rakefile is present")
+        invoke(@main, :check)
+      end
+    end
+
+    context "when Rakefile doesn't exist" do
+      it "should show that Rakefile is neccessary" do
+        Shelly::StructureValidator.any_instance.stub(:repo_paths).and_return([])
+        $stdout.should_receive(:puts).with("  #{red("✗")} Rakefile is missing")
         invoke(@main, :check)
       end
     end
@@ -1576,8 +1607,10 @@ Wait until cloud is in 'turned off' state and try again.")
 
     it "should display only errors and warnings when in verbose mode" do
       $stdout.should_not_receive(:puts).with("  #{green("✓")} Gem 'thin' is present")
+      $stdout.should_not_receive(:puts).with("  #{green("✓")} Task 'db:migrate' is present")
       $stdout.should_receive(:puts).with("  #{yellow("ϟ")} Gem 'shelly-dependencies' is missing, we recommend to install it\n    See more at https://shellycloud.com/documentation/requirements#shelly-dependencies")
       $stdout.should_receive(:puts).with("  #{red("✗")} Gem 'rake' is missing in the Gemfile")
+      $stdout.should_receive(:puts).with("  #{red("✗")} Task 'db:setup' is missing")
       $stdout.should_receive(:puts).with("\nFix points marked with #{red("✗")} to run your application on the Shelly Cloud")
       $stdout.should_receive(:puts).with("See more about requirements on https://shellycloud.com/documentation/requirements")
       @main.check(false)

data/spec/shelly/client_spec.rb

@@ -244,7 +244,7 @@ describe Shelly::Client do
   end
 
   describe "#console" do
-    it "should fetch instance data from API" do
+    it "should fetch virtual server data from API" do
       body = {:port => "40010", :host => "console.example.com", :user => "foo-production"}
       FakeWeb.register_uri(:get, api_url("apps/staging-foo/console"),
         :body => body.to_json)

data/spec/shelly/cloudfile_spec.rb

@@ -104,12 +104,12 @@ config
       @cloudfile.stub(:current_user => mock(:email => "bob@example.com"))
     end
 
-    context "for large instance" do
+    context "for large virtual server" do
       it "should generate sample Cloudfile with given attributes" do
         FakeFS.deactivate!
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:
@@ -131,13 +131,13 @@ config
       end
     end
 
-    context "for small instance" do
+    context "for small virtual server" do
       it "should generate sample Cloudfile with given attributes and 2 thins" do
         FakeFS.deactivate!
         @cloudfile.size = "small"
         expected = <<-config
 foo-staging:
-  ruby_version: 1.9.3 # 1.9.3, 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 2.0.0, 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:

data/spec/shelly/structure_validator_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Shelly::StructureValidator do
   before do
     @validator = Shelly::StructureValidator.new
-    @validator.stub(:repo_paths => ["Gemfile", "Gemfile.lock", "config.ru"])
+    @validator.stub(:repo_paths => ["Gemfile", "Gemfile.lock", "config.ru", "Rakefile"])
   end
 
   describe "#gemfile?" do
@@ -51,6 +51,21 @@ describe Shelly::StructureValidator do
     end
   end
 
+  describe "#rakefile?" do
+    context "when Rakefile exists" do
+      it "should return true" do
+        @validator.rakefile?.should be_true
+      end
+    end
+
+    context "when Rakefile doesn't exist" do
+      it "should return false" do
+        @validator.stub(:repo_paths => ["Gemfile"])
+        @validator.rakefile?.should be_false
+      end
+    end
+  end
+
   describe "#gem?" do
     before do
       @validator.stub(:gemfile? => true, :gemfile_lock? => true)
@@ -80,4 +95,26 @@ describe Shelly::StructureValidator do
       end
     end
   end
+
+  describe "#task?" do
+    before do
+      @validator.should_receive(:'`').at_most(1).with("rake -P").and_return("rake db:migrate")
+      @validator.stub(:rakefile? => true)
+    end
+
+    it "should return true if task is present" do
+      @validator.task?("db:migrate").should be_true
+    end
+
+    it "should return false if task is missing" do
+      @validator.task?("db:setup").should be_false
+    end
+
+    context "when Rakefile doesn't exist" do
+      it "should return false" do
+        @validator.stub(:rakefile? => false)
+        @validator.task?("db:migrate").should be_false
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require "input_faker"
 require "fakefs/spec_helpers"
 require "fakeweb"
 require "launchy"
+require "rake"
 
 ENV['THOR_COLUMNS'] = "180"
 FakeWeb.allow_net_connect = false

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre
+  version: 0.2.7
+  prerelease: 
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,34 +86,7 @@ dependencies:
   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
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -195,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -276,46 +273,32 @@ 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'
+      segments:
+      - 0
+      hash: -626297834617784665
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -626297834617784665
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.0.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 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: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmQzZjFkMjc0MWFjMDdjNDVhN2VmYmUzZmM0MjI1NTNhMmRlODk3MQ==
-  data.tar.gz: !binary |-
-    MzAwOWQ1NzQzZTJiOGUwNmVjYTFiYTRjZjg1YzU0ZDAwODhmNDdjYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjU5MmFlNmE4ZGU1YWJmY2JlYzlmYjIyNjUyYTA3YTU4YmE5NjdkZTBjYzQy
-    MTZiNTk5NzllYjU5NTQxMWU2OGE2ZTIzNzI0NTQ2NDk1NGMzNDU1YzgxYWM1
-    NTM3ZjA1MjM5ZTRhYTE2NDA1MGIzMGVmOTk2YzlmMmNlYmNiYjg=
-  data.tar.gz: !binary |-
-    MzcyYjcwZGMyNzdkZTgxYTBhMzM3ZWU0MzJjYjJiMTYxZmEyNjRiZDczNDg2
-    ODRlMDU0OGI0N2NhNTE1ODJhZTc0Mzk5YzU1ZjNkZDNkYmI5Y2E4MWExMTZl
-    N2Y5NDU0NGVhODU0Mzc2OTc0YjRkY2FjZWFhMjI2NDdhYmY2OWY=