shelly 0.1.25 → 0.1.26

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.1.25 / 2012-09-11
+## 0.1.26 / 2012-09-11
+
+* [bug] Fixes -c/--cloud option bug in previous version
+
+## 0.1.25 / 2012-09-11 - yanked
 
 * [feature] `shelly check` checks gems based on Cloudfile
 * [bug] Show 10 recent backups in `backup list` command, instead of the oldest

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :cli => '--color --format doc' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch('lib/shelly/helpers.rb') { "spec" }
+  watch(%r{^lib/shelly/(.+)\.rb$})     { |m| "spec/shelly/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -13,3 +13,7 @@
 ## Running tests
 
     bundle exec rake
+
+or
+
+    guard

data/lib/shelly/cli/backup.rb

@@ -33,7 +33,7 @@ module Shelly
 
           say "Available backups:", :green
           say_new_line
-          print_table(to_display, :indent => 2)
+          print_table(to_display, :ident => 2)
         else
           say "No database backups available"
         end

data/lib/shelly/cli/command.rb

@@ -4,6 +4,7 @@ require "thor/thor"
 require "thor/group"
 require "thor/options"
 require "thor/arguments"
+require "thor/basic"
 
 module Shelly
   module CLI

data/lib/shelly/cli/main.rb

@@ -19,6 +19,7 @@ module Shelly
 
       check_unknown_options!(:except => :rake)
 
+      # FIXME: it should be possible to pass single symbol, instead of one element array
       before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console, :dbconsole]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
@@ -133,7 +134,7 @@ module Shelly
             end
             [app["code_name"], "|  #{state.humanize}#{msg}"]
           end
-          print_table(apps_table, :indent => 2)
+          print_table(apps_table, :ident => 2)
         else
           say "You have no clouds yet", :green
         end
@@ -148,21 +149,21 @@ module Shelly
           " (deployment log: `shelly deploys show last -c #{app}`)"
         end
         say "Cloud #{app}:", msg.present? ? :red : :green
-        print_wrapped "State: #{app.state}#{msg}", :indent => 2
+        print_wrapped "State: #{app.state}#{msg}", :ident => 2
         say_new_line
-        print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :indent => 2
-        print_wrapped "Deployed commit message: #{app.git_info["deployed_commit_message"]}", :indent => 2
-        print_wrapped "Deployed by: #{app.git_info["deployed_push_author"]}", :indent => 2
+        print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :ident => 2
+        print_wrapped "Deployed commit message: #{app.git_info["deployed_commit_message"]}", :ident => 2
+        print_wrapped "Deployed by: #{app.git_info["deployed_push_author"]}", :ident => 2
         say_new_line
-        print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :indent => 2
-        print_wrapped "Web server IP: #{app.web_server_ip}", :indent => 2
+        print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :ident => 2
+        print_wrapped "Web server IP: #{app.web_server_ip}", :ident => 2
         say_new_line
         if app.statistics.present?
-          print_wrapped "Statistics:", :indent => 2
+          print_wrapped "Statistics:", :ident => 2
           app.statistics.each do |stat|
-            print_wrapped "#{stat['name']}:", :indent => 4
-            print_wrapped "Load average: 1m: #{stat['load']['avg01']}, 5m: #{stat['load']['avg05']}, 15m: #{stat['load']['avg15']}", :indent => 6
-            print_wrapped "CPU: #{stat['cpu']['wait']}%, MEM: #{stat['memory']['percent']}%, SWAP: #{stat['swap']['percent']}%", :indent => 6
+            print_wrapped "#{stat['name']}:", :ident => 4
+            print_wrapped "Load average: 1m: #{stat['load']['avg01']}, 5m: #{stat['load']['avg05']}, 15m: #{stat['load']['avg15']}", :ident => 6
+            print_wrapped "CPU: #{stat['cpu']['wait']}%, MEM: #{stat['memory']['percent']}%, SWAP: #{stat['swap']['percent']}%", :ident => 6
           end
         end
       rescue Client::GatewayTimeoutException
@@ -429,10 +430,6 @@ We have been notified about it. We will be adding new resources shortly}
           end
         end
 
-        print_check(!structure.gem?("mysql") && !structure.gem?("mysql2"),"",
-          "mysql driver present in the Gemfile (not supported on Shelly Cloud)",
-          :show_fulfilled => false)
-
         if structure.valid?
           if verbose
             say "\nGreat! Your application is ready to run on Shelly Cloud"

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

data/lib/thor/basic.rb

@@ -0,0 +1,9 @@
+class Thor
+  module Shell
+
+    def print_wrapped(*args)
+      shell.print_wrapped(*args)
+    end
+
+  end
+end

data/lib/thor/options.rb

@@ -1,10 +1,11 @@
 class Thor
   class Options < Arguments
+
     def check_unknown!
-      unknown = @extra.select { |str| str =~ /^--?(?:(?!--).)*$/ }
       raise UnknownArgumentError, "shelly: unrecognized option '#{@unknown.join(', ')}'\n" +
         "Usage: shelly [COMMAND]... [OPTIONS]\n" +
-        "Try 'shelly --help' for more information" unless unknown.empty?
+        "Try 'shelly --help' for more information" unless @unknown.empty?
     end
+
   end
 end

data/lib/thor/thor.rb

@@ -2,7 +2,7 @@ class Thor
   class << self
     def before_hook(method, options = {})
       @hook = {} unless @hook
-      @hook[method] = {:only => Array(options[:only])}
+      @hook[method] = options
     end
 
     def hooks
@@ -28,46 +28,12 @@ class Thor
     rescue Thor::Error => e
       ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
       exit(1) if exit_on_failure?
-    rescue Errno::EPIPE
-      # This happens if a thor task is piped to something like `head`,
-      # which closes the pipe when it's done reading. This will also
-      # mean that if the pipe is closed, further unnecessary
-      # computation will not occur.
-      exit(0)
     end
 
-    # We overwrite this method so namespace is shown
+    # We overwrite this method so namespace is show
     # shelly *backup* restore FILENAME
-    def handle_argument_error(task, error, arity = nil)
-      banner = self.banner(task, nil, self.to_s != 'Shelly::CLI::Main')
-      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as `#{banner}`"
-    end
-
-    protected
-    # this has to overwritten so that in tests args are passed correctly
-    # only change is the commented line
-    # its for some edge cases when boolean options are passed in some
-    # strange order
-    def dispatch(meth, given_args, given_opts, config) #:nodoc:
-      meth ||= retrieve_task_name(given_args)
-      task = all_tasks[normalize_task_name(meth)]
-
-      if task
-        args, opts = Thor::Options.split(given_args)
-      else
-        args, opts = given_args, nil
-        task = Thor::DynamicTask.new(meth)
-      end
-
-      opts = given_opts || opts || []
-      config.merge!(:current_task => task, :task_options => task.options)
-
-      instance = new(args, opts, config)
-      yield instance if block_given?
-      # args = instance.args
-      trailing = args[Range.new(arguments.size, -1)]
-
-      instance.invoke_task(task, trailing || [])
+    def handle_argument_error(task, error)
+      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task, nil, self.to_s != 'Shelly::CLI::Main').inspect}."
     end
   end
 end

data/shelly.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "shelly"
   s.add_development_dependency "rspec", "~> 2.11.0"
   s.add_development_dependency "rake"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
   s.add_development_dependency "simplecov"
   if RUBY_PLATFORM =~ /darwin/
     s.add_development_dependency "ruby_gntp"
@@ -21,7 +23,7 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency "fakefs"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "thor", "~> 0.15.4"
+  s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "progressbar"

data/spec/shelly/cli/files_spec.rb

@@ -29,6 +29,7 @@ describe Shelly::CLI::Files do
 
     it "should exit if rsync isn't installed" do
       FakeFS::File.stub(:executable?).and_return(false)
+
       $stdout.should_receive(:puts).with(red "You need to install rsync in order to upload and download files")
       lambda { invoke(@cli_files, :upload, "some/path") }.should raise_error(SystemExit)
     end

data/spec/shelly/cli/main_spec.rb

@@ -1402,20 +1402,6 @@ We have been notified about it. We will be adding new resources shortly")
       end
     end
 
-    context "when mysql gem exists" do
-      it "should show that mysql gem is not supported by Shelly Cloud" do
-        Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["mysql"])
-        $stdout.should_receive(:puts).with("  #{red("✗")} mysql driver present in the Gemfile (not supported on Shelly Cloud)")
-        invoke(@main, :check)
-      end
-
-      it "should show that mysql2 gem is not supported by Shelly Cloud" do
-        Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["mysql2"])
-        $stdout.should_receive(:puts).with("  #{red("✗")} mysql driver present in the Gemfile (not supported on Shelly Cloud)")
-        invoke(@main, :check)
-      end
-    end
-
     context "when bundler raise error" do
       it "should display error message" do
         exception = Bundler::BundlerError.new('Bundler error')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -124,13 +156,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.14.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.14.7
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +279,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/shelly
@@ -274,6 +307,7 @@ files:
 - lib/shelly/user.rb
 - lib/shelly/version.rb
 - lib/thor/arguments.rb
+- lib/thor/basic.rb
 - lib/thor/options.rb
 - lib/thor/thor.rb
 - scrolls/shellycloud.rb