relish 0.1.2 → 0.1.3

data/README.md

@@ -1 +1,3 @@
-Run `relish help` to view the available commands.
+Run `relish help` to view the available commands.
+
+For those of you checking out the code, all of the cukes and specs exist in the rails 3 app, which is a private repo.

data/features/help.feature

@@ -24,15 +24,19 @@ Feature: Help
                                                              # example: relish config:add project:rspec-core
                                                              # valid configuration options: project
       projects                                               # list your projects
-      projects:add <org_or_user_handle>/<project_handle>     # add a project
+      projects:add <org or user handle>/<project handle>     # add a project
                                                              # append :private to make the project private
                                                              # example: relish projects:add rspec/rspec-core:private
-      projects:remove <project_handle>                       # remove a project
+      projects:remove <project>                              # remove a project
+      projects:visibility <project>:<public or private>      # set the status of a project
+                                                             # example: relish projects:visibility rspec/rspec-core:private
+      projects:rename <project>:<new handle>                 # rename a project's handle
+                                                             # example: relish projects:rename rspec/rspec-core:rspec-corez
       push <project>                                         # push features to relishapp.com
       collab                                                 # list the collaborators for a project
-      collab:add <project>:<collaborator_handle_or_email>    # add a collaborator to a project
+      collab:add <project>:<collaborator handle or email>    # add a collaborator to a project
                                                              # example: relish collab:add rspec/rspec-core:justin
-      collab:remove <project>:<collaborator_handle_or_email> # remove a collaborator from a project
+      collab:remove <project>:<collaborator handle or email> # remove a collaborator from a project
                                                              # example: relish collab:remove rspec/rspec-core:justin
       
       """

data/lib/relish/command.rb

@@ -1,5 +1,6 @@
 require 'relish'
 require 'relish/helpers'
+require 'relish/error_messages'
 require 'relish/commands/base'
 require 'relish/commands/collab'
 require 'relish/commands/config'
@@ -22,7 +23,7 @@ module Relish
         command_class, method = command.split(':')
         return get_command(command_class.capitalize), get_method(method)
       rescue NameError
-        error "Unknown command. Run 'relish help' for usage information."
+        error ErrorMessages.unknown_command
       end
       
     private

data/lib/relish/commands/base.rb

@@ -1,10 +1,11 @@
 require 'yaml'
 require 'json'
-require 'relish/ui'
+require 'relish/error_messages'
 require 'relish/helpers'
 require 'relish/options_file'
+require 'relish/param_methods'
+require 'relish/ui'
 require 'relish/commands/dsl'
-require 'relish/commands/param_methods'
 
 module Relish
   module Command
@@ -13,7 +14,7 @@ module Relish
       extend Dsl
       
       option :api_token, :default => lambda { get_and_store_api_token }
-      option :host,      :default => lambda { Relish.default_host }, :display => false
+      option :host,      :default => lambda { Relish.default_host }
       
       attr_writer :args
       attr_reader :cli_options
@@ -37,7 +38,7 @@ module Relish
     private
     
       def project
-        merged_options['project'] || error('You must specify a project.')
+        merged_options['project'] || error(:project_blank)
       end
 
       def get_and_store_api_token
@@ -99,6 +100,10 @@ module Relish
         response
       end
       
+      def escape(str)
+        CGI.escape(str)
+      end
+      
     end
   end
 end

data/lib/relish/commands/collab.rb

@@ -7,14 +7,14 @@ module Relish
         puts format(resource[resource_path_for_no_option].get(:accept => :json))
       end
       
-      usage   'collab:add <project>:<collaborator_handle_or_email>'
+      usage   'collab:add <project>:<collaborator handle or email>'
       desc    ['add a collaborator to a project',
                'example: relish collab:add rspec/rspec-core:justin']
       command :add do
         puts resource[resource_path_for_option].post(:handle_or_email => handle_or_email)
       end
       
-      usage   'collab:remove <project>:<collaborator_handle_or_email>'
+      usage   'collab:remove <project>:<collaborator handle or email>'
       desc    ['remove a collaborator from a project',
                'example: relish collab:remove rspec/rspec-core:justin']
       command :remove do
@@ -32,7 +32,7 @@ module Relish
       end
       
       def resource_path(project)
-        "projects/#{project}/memberships"
+        "projects/#{escape(project)}/memberships"
       end
       
       def handle_or_email

data/lib/relish/commands/projects.rb

@@ -1,27 +1,46 @@
 module Relish
   module Command
     class Projects < Base
-
+      
       desc    'list your projects'
       command :default do
         puts format(resource['projects'].get(:accept => :json))
       end
       
-      usage   'projects:add <org_or_user_handle>/<project_handle>'
+      usage   'projects:add <org or user handle>/<project handle>'
       desc    ['add a project',
                'append :private to make the project private',
                'example: relish projects:add rspec/rspec-core:private']
       command :add do
-        puts resource['projects'].post(:handle => handle, :private => private?)
+        puts resource['projects'].post(:handle => handle_to_add, :private => private?)
       end
       
-      usage   'projects:remove <project_handle>'
+      usage   'projects:remove <project>'
       desc    'remove a project'
       command :remove do
-        puts resource["projects/#{@param}"].delete
+        puts resource["projects/#{escape(handle_to_remove)}"].delete
+      end
+      
+      usage   'projects:visibility <project>:<public or private>'
+      desc    ['set the status of a project',
+               'example: relish projects:visibility rspec/rspec-core:private']
+      command :visibility do
+        puts resource["projects/#{escape(handle_to_update)}"].put(
+          :project => { :private => private? }
+        )
+      end
+      
+      usage   'projects:rename <project>:<new handle>'
+      desc    ["rename a project's handle",
+               'example: relish projects:rename rspec/rspec-core:rspec-corez']
+      command :rename do
+        puts resource["projects/#{escape(handle_to_update)}"].put(
+          :project => { :handle => rename_handle }
+        )
       end
       
     private
+    
       def format(response)
         json_parse(response) do |hash| 
           result = hash['project']['full_handle']
@@ -30,8 +49,21 @@ module Relish
         end
       end
       
+      def handle_to_add
+        handle || error(:project_blank)
+      end
+      alias_method :handle_to_update, :handle_to_add
+      
+      def handle_to_remove
+        handle || project
+      end
+      
       def handle
-        @param.without_option
+        @param.without_option if @param
+      end
+      
+      def rename_handle
+        @param.has_option? ? @param.extract_option : error(:handle_is_blank)
       end
       
       def private?

data/lib/relish/error_messages.rb

@@ -0,0 +1,21 @@
+module Relish
+  module ErrorMessages
+    module_function
+  
+    def project_blank
+      'Please specify a project.' + help
+    end
+    
+    def handle_is_blank
+      'Please specify a new handle.' + help
+    end
+  
+    def unknown_command
+      'Unknown command.' + help
+    end
+  
+    def help(pad = true)
+      (pad ? ' ' : '') + "Run 'relish help' for usage information."
+    end
+  end
+end

data/lib/relish/helpers.rb

@@ -2,6 +2,8 @@ module Relish
   module Helpers
     
     def error(message)
+      message = ErrorMessages.send(message) if message.is_a?(Symbol)
+      
       $stderr.puts(message)
       exit 1
     end

data/relish.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = "relish"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = '>= 1.3.5'
   s.authors = ["Matt Wynne", "Justin Ko"]
-  s.date = "2010-11-15"
+  s.date = "2010-11-17"
   s.description = %q{Client gem for http://relishapp.com}
   s.email = "jko170@gmail.com"
 

data/spec/relish/error_messages_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Relish
+  describe ErrorMessages do
+    
+    describe '#project_blank' do
+      specify do
+        described_class.project_blank.should eq(
+          "Please specify a project. Run 'relish help' for usage information."
+        )
+      end
+    end
+    
+    describe '#handle_is_blank' do
+      specify do
+        described_class.handle_is_blank.should eq(
+          "Please specify a new handle. Run 'relish help' for usage information."
+        )
+      end
+    end
+  
+    describe '#unknown_command' do
+      specify do
+        described_class.unknown_command.should eq(
+          "Unknown command. Run 'relish help' for usage information."
+        )
+      end
+    end
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Matt Wynne
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -07:00
+date: 2010-11-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -196,11 +196,12 @@ files:
 - lib/relish/commands/dsl/help_text.rb
 - lib/relish/commands/dsl/option.rb
 - lib/relish/commands/help.rb
-- lib/relish/commands/param_methods.rb
 - lib/relish/commands/projects.rb
 - lib/relish/commands/push.rb
+- lib/relish/error_messages.rb
 - lib/relish/helpers.rb
 - lib/relish/options_file.rb
+- lib/relish/param_methods.rb
 - lib/relish/ui.rb
 - relish.gemspec
 - spec/relish/command_spec.rb
@@ -209,10 +210,11 @@ files:
 - spec/relish/commands/dsl/command_spec.rb
 - spec/relish/commands/dsl/help_text_spec.rb
 - spec/relish/commands/dsl/option_spec.rb
-- spec/relish/commands/param_methods_spec.rb
 - spec/relish/commands/projects_spec.rb
 - spec/relish/commands/push_spec.rb
+- spec/relish/error_messages_spec.rb
 - spec/relish/options_file_spec.rb
+- spec/relish/param_methods_spec.rb
 - spec/relish_spec.rb
 - spec/spec_helper.rb
 - spec/support/context_class_examples.rb
@@ -265,10 +267,11 @@ test_files:
 - spec/relish/commands/dsl/command_spec.rb
 - spec/relish/commands/dsl/help_text_spec.rb
 - spec/relish/commands/dsl/option_spec.rb
-- spec/relish/commands/param_methods_spec.rb
 - spec/relish/commands/projects_spec.rb
 - spec/relish/commands/push_spec.rb
+- spec/relish/error_messages_spec.rb
 - spec/relish/options_file_spec.rb
+- spec/relish/param_methods_spec.rb
 - spec/relish_spec.rb
 - spec/spec_helper.rb
 - spec/support/context_class_examples.rb