shelly 0.1.27 → 0.1.28

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.28 / 2012-09-21
+
+* [feature] Singular form of all subcommands with possibility to invoke them with plural form
+
+  ```shelly user list``` and ```shelly users list``` works the same
+
 ## 0.1.27 / 2012-09-12
 
 * [bug] shelly check - wrong method for retrieving databases from Cloudfile

data/lib/shelly/cli/config.rb

@@ -3,7 +3,7 @@ require "shelly/cli/command"
 module Shelly
   module CLI
     class Config < Command
-      include Thor::Actions
+      namespace :config
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :show, :create, :new, :edit, :update, :delete]
@@ -11,7 +11,7 @@ module Shelly
 
       desc "list", "List configuration files"
       def list
-        app = multiple_clouds(options[:cloud], "list")
+        app = multiple_clouds(options[:cloud], "config list")
         configs = app.configs
         unless configs.empty?
           say "Configuration files for #{app}", :green
@@ -34,7 +34,7 @@ module Shelly
 
       desc "show PATH", "View configuration file"
       def show(path)
-        app = multiple_clouds(options[:cloud], "show #{path}")
+        app = multiple_clouds(options[:cloud], "config show #{path}")
         config = app.config(path)
         say "Content of #{config["path"]}:", :green
         say config["content"]
@@ -62,7 +62,7 @@ module Shelly
       desc "edit PATH", "Edit configuration file"
       def edit(path = nil)
         say_error "No configuration file specified" unless path
-        app = multiple_clouds(options[:cloud], "edit #{path}")
+        app = multiple_clouds(options[:cloud], "config edit #{path}")
         config = app.config(path)
         content = open_editor(config["path"], config["content"])
         app.update_config(path, content)
@@ -80,7 +80,7 @@ module Shelly
 
       desc "delete PATH", "Delete configuration file"
       def delete(path)
-        app = multiple_clouds(options[:cloud], "delete #{path}")
+        app = multiple_clouds(options[:cloud], "config delete #{path}")
         answer = yes?("Are you sure you want to delete 'path' (yes/no): ")
         if answer
           app.delete_config(path)
@@ -105,17 +105,17 @@ module Shelly
         def open_editor(path, output = "")
           filename = "shelly-edit-"
           0.upto(20) { filename += rand(9).to_s }
-          filename << File.extname(path)
-          filename = File.join(Dir.tmpdir, filename)
-          tf = File.open(filename, "w")
+          filename << ::File.extname(path)
+          filename = ::File.join(Dir.tmpdir, filename)
+          tf = ::File.open(filename, "w")
           tf.sync = true
           tf.puts output
           tf.close
           no_editor unless system("#{ENV['EDITOR']} #{tf.path}")
-          tf = File.open(filename, "r")
+          tf = ::File.open(filename, "r")
           output = tf.gets(nil)
           tf.close
-          File.unlink(filename)
+          ::File.unlink(filename)
           output
         end
 

data/lib/shelly/cli/{deploys.rb → deploy.rb}

@@ -3,8 +3,8 @@ require "time"
 
 module Shelly
   module CLI
-    class Deploys < Command
-      namespace :deploys
+    class Deploy < Command
+      namespace :deploy
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :show]
@@ -12,7 +12,7 @@ module Shelly
 
       desc "list", "Lists deploy logs"
       def list
-        app = multiple_clouds(options[:cloud], "deploys list")
+        app = multiple_clouds(options[:cloud], "deploy list")
         logs = app.deploy_logs
         unless logs.empty?
           say "Available deploy logs", :green
@@ -33,7 +33,7 @@ module Shelly
       desc "show LOG", "Show specific deploy log"
       def show(log = nil)
         specify_log(log)
-        app = multiple_clouds(options[:cloud], "deploys show #{log}")
+        app = multiple_clouds(options[:cloud], "deploy show #{log}")
         content = app.deploy_log(log)
         say "Log for deploy done on #{content["created_at"]}", :green
         if content["bundle_install"]

data/lib/shelly/cli/{files.rb → file.rb}

@@ -2,8 +2,8 @@ require "shelly/cli/command"
 
 module Shelly
   module CLI
-    class Files < Command
-      namespace :files
+    class File < Command
+      namespace :file
       include Helpers
 
       before_hook :logged_in?, :only => [:upload, :download]
@@ -12,7 +12,7 @@ module Shelly
 
       desc "upload PATH", "Upload files to persistent data storage"
       def upload(path)
-        app = multiple_clouds(options[:cloud], "upload #{path}")
+        app = multiple_clouds(options[:cloud], "file upload #{path}")
         app.upload(path)
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot upload files."
@@ -25,7 +25,7 @@ module Shelly
         DEST_PATH - optional destination where files should be saved. By default is current working directory.
       }
       def download(relative_source = ".", destination = ".")
-        app = multiple_clouds(options[:cloud], "download #{relative_source} #{destination}")
+        app = multiple_clouds(options[:cloud], "file download #{relative_source} #{destination}")
         app.download(relative_source, destination)
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot download files."

data/lib/shelly/cli/main.rb

@@ -2,20 +2,18 @@
 require "shelly/cli/command"
 require "shelly/cli/user"
 require "shelly/cli/backup"
-require "shelly/cli/deploys"
+require "shelly/cli/deploy"
 require "shelly/cli/config"
-require "shelly/cli/files"
+require "shelly/cli/file"
 
 module Shelly
   module CLI
     class Main < Command
-      include Thor::Actions
-
-      register(User, "user", "user <command>", "Manage collaborators")
-      register(Backup, "backup", "backup <command>", "Manage database backups")
-      register(Deploys, "deploys", "deploys <command>", "View deploy logs")
-      register(Config, "config", "config <command>", "Manage application configuration files")
-      register(Files, "files", "files <command>", "Upload and download files to and from persistent storage")
+      register_subcommand(User, "user", "user <command>", "Manage collaborators")
+      register_subcommand(Backup, "backup", "backup <command>", "Manage database backups")
+      register_subcommand(Deploy, "deploy", "deploy <command>", "View deploy logs")
+      register_subcommand(Config, "config", "config <command>", "Manage application configuration files")
+      register_subcommand(File, "file", "file <command>", "Upload and download files to and from persistent storage")
 
       check_unknown_options!(:except => :rake)
 

data/lib/shelly/cli/user.rb

@@ -11,7 +11,7 @@ module Shelly
 
       desc "list", "List users with access to clouds defined in Cloudfile"
       def list
-        app = multiple_clouds(options[:cloud], "list")
+        app = multiple_clouds(options[:cloud], "user list")
         say "Cloud #{app}:"
         app.active_collaborations.each { |c| say "  #{c["email"]}" }
         app.inactive_collaborations.each { |c|
@@ -21,7 +21,7 @@ module Shelly
       desc "add [EMAIL]", "Add new developer to clouds defined in Cloudfile"
       def add(email = nil)
         user = Shelly::User.new
-        app = multiple_clouds(options[:cloud], "add")
+        app = multiple_clouds(options[:cloud], "user add")
         user_email = email || ask_for_email({:guess_email => false})
         user.send_invitation(app.to_s, user_email)
         say "Sending invitation to #{user_email} to work on #{app}", :green
@@ -37,7 +37,7 @@ module Shelly
       desc "delete [EMAIL]", "Remove developer from clouds defined in Cloudfile"
       def delete(email = nil)
         user = Shelly::User.new
-        app = multiple_clouds(options[:cloud], "delete")
+        app = multiple_clouds(options[:cloud], "user delete")
         user_email = email || ask_for_email({:guess_email => false})
         user.delete_collaboration(app.to_s, user_email)
         say "User #{user_email} deleted from cloud #{app}"

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.27"
+  VERSION = "0.1.28"
 end

data/lib/thor/basic.rb

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

data/lib/thor/thor.rb

@@ -1,5 +1,11 @@
 class Thor
   class << self
+    def register_subcommand(klass, subcommand, usage, description, options = {})
+      register(klass, subcommand, usage, description, options)
+      # This could be done with ActiveSupport::Inflector module but is this necessary?
+      register(klass, subcommand + "s", usage, description, :hide => true)
+    end
+
     def before_hook(method, options = {})
       @hook = {} unless @hook
       @hook[method] = options

data/spec/shelly/cli/{deploys_spec.rb → deploy_spec.rb}

@@ -1,11 +1,11 @@
 require "spec_helper"
-require "shelly/cli/deploys"
+require "shelly/cli/deploy"
 
-describe Shelly::CLI::Deploys do
+describe Shelly::CLI::Deploy do
   before do
     FileUtils.stub(:chmod)
-    @deploys = Shelly::CLI::Deploys.new
-    Shelly::CLI::Deploys.stub(:new).and_return(@deploys)
+    @deploys = Shelly::CLI::Deploy.new
+    Shelly::CLI::Deploy.stub(:new).and_return(@deploys)
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     $stdout.stub(:puts)

data/spec/shelly/cli/{files_spec.rb → file_spec.rb}

@@ -1,10 +1,10 @@
 require "spec_helper"
-require "shelly/cli/files"
+require "shelly/cli/file"
 
-describe Shelly::CLI::Files do
+describe Shelly::CLI::File do
   before do
     FileUtils.stub(:chmod)
-    @cli_files = Shelly::CLI::Files.new
+    @cli_files = Shelly::CLI::File.new
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     @client.stub(:token).and_return("abc")

data/spec/shelly/cli/main_spec.rb

@@ -27,29 +27,29 @@ describe Shelly::CLI::Main do
     it "should display available commands" do
       out = IO.popen("bin/shelly --debug").read.strip
       out.should include("Tasks:")
-      out.should include("shelly add                # Add a new cloud")
-      out.should include("shelly backup <command>   # Manage database backups")
-      out.should include("shelly check              # Check if application fulfills Shelly Cloud requirements")
-      out.should include("shelly config <command>   # Manage application configuration files")
-      out.should include("shelly console            # Open application console")
-      out.should include("shelly dbconsole          # Run rails dbconsole")
-      out.should include("shelly delete             # Delete the cloud")
-      out.should include("shelly deploys <command>  # View deploy logs")
-      out.should include("shelly files <command>    # Upload and download files to and from persistent storage")
-      out.should include("shelly help [TASK]        # Describe available tasks or one specific task")
-      out.should include("shelly info               # Show basic information about cloud")
-      out.should include("shelly list               # List available clouds")
-      out.should include("shelly login [EMAIL]      # Log into Shelly Cloud")
-      out.should include("shelly logout             # Logout from Shelly Cloud")
-      out.should include("shelly logs               # Show latest application logs")
-      out.should include("shelly open               # Open application page in browser")
-      out.should include("shelly rake TASK          # Run rake task")
-      out.should include("shelly redeploy           # Redeploy application")
-      out.should include("shelly register [EMAIL]   # Register new account")
-      out.should include("shelly setup              # Set up git remotes for deployment on Shelly Cloud")
-      out.should include("shelly start              # Start the cloud")
-      out.should include("shelly stop               # Shutdown the cloud")
-      out.should include("shelly user <command>     # Manage collaborators")
+      out.should include("shelly add               # Add a new cloud")
+      out.should include("shelly backup <command>  # Manage database backups")
+      out.should include("shelly check             # Check if application fulfills Shelly Cloud requirements")
+      out.should include("shelly config <command>  # Manage application configuration files")
+      out.should include("shelly console           # Open application console")
+      out.should include("shelly dbconsole         # Run rails dbconsole")
+      out.should include("shelly delete            # Delete the cloud")
+      out.should include("shelly deploy <command>  # View deploy logs")
+      out.should include("shelly file <command>    # Upload and download files to and from persistent storage")
+      out.should include("shelly help [TASK]       # Describe available tasks or one specific task")
+      out.should include("shelly info              # Show basic information about cloud")
+      out.should include("shelly list              # List available clouds")
+      out.should include("shelly login [EMAIL]     # Log into Shelly Cloud")
+      out.should include("shelly logout            # Logout from Shelly Cloud")
+      out.should include("shelly logs              # Show latest application logs")
+      out.should include("shelly open              # Open application page in browser")
+      out.should include("shelly rake TASK         # Run rake task")
+      out.should include("shelly redeploy          # Redeploy application")
+      out.should include("shelly register [EMAIL]  # Register new account")
+      out.should include("shelly setup             # Set up git remotes for deployment on Shelly Cloud")
+      out.should include("shelly start             # Start the cloud")
+      out.should include("shelly stop              # Shutdown the cloud")
+      out.should include("shelly user <command>    # Manage collaborators")
       out.should include("Options")
       out.should include("[--debug]  # Show debug information")
       out.should include("-h, [--help]   # Describe available tasks or one specific task")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -292,8 +292,8 @@ files:
 - lib/shelly/cli/backup.rb
 - lib/shelly/cli/command.rb
 - lib/shelly/cli/config.rb
-- lib/shelly/cli/deploys.rb
-- lib/shelly/cli/files.rb
+- lib/shelly/cli/deploy.rb
+- lib/shelly/cli/file.rb
 - lib/shelly/cli/main.rb
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
@@ -318,8 +318,8 @@ files:
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploys_spec.rb
-- spec/shelly/cli/files_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
@@ -362,8 +362,8 @@ test_files:
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploys_spec.rb
-- spec/shelly/cli/files_spec.rb
+- spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb