relish 0.0.9 → 0.1.0

data/features/help.feature

@@ -4,24 +4,26 @@ Feature: Help
   The `relish help` command displays all available commands
   along with a description of each.
   
-  The `relish help:<command>` option will display help text
-  for that particular command.
-  
   Scenario: View all available commands with the help command
     When I successfully run "relish help"
     Then the output should contain exactly:
       """
       === Available Commands
 
-      help                                                  # show this usage
-      config                                                # display the contents of your options file
-      config:show                                           # display the contents of your options file
-      config:add --<option> <value>                         # add a configuration option to your options file
-      projects                                              # list your projects
-      projects:list                                         # list your projects
-      projects:add <org_or_user_handle>/<project_handle>    # add a project
-      projects:remove <org_or_user_handle>/<project_handle> # remove a project
-      push                                                  # push features to relishapp.com
+      help                                                                               # show this usage
+      config                                                                             # display the contents of your options file
+      config:add --<option> <value>                                                      # add a configuration option to your options file
+      projects                                                                           # list your projects
+      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 <org_or_user_handle>/<project_handle>                              # remove a project
+      push                                                                               # push features to relishapp.com
+      collab                                                                             # list the collaborators for a project
+      collab:add <org_or_user_handle>/<project_handle>:<collaborator_handle_or_email>    # add a collaborator to a project
+                                                                                         # example: relish collab:add rspec/rspec-core:justin
+      collab:remove <org_or_user_handle>/<project_handle>:<collaborator_handle_or_email> # remove a collaborator from a project
+                                                                                         # example: relish collab:remove rspec/rspec-core:justin
       
       """
       

data/lib/relish.rb

@@ -1,3 +1,5 @@
+require 'relish/core_ext'
+
 module Relish
   class << self
     

data/lib/relish/command.rb

@@ -1,10 +1,11 @@
 require 'relish'
 require 'relish/helpers'
 require 'relish/commands/base'
-require 'relish/commands/push'
+require 'relish/commands/collab'
 require 'relish/commands/config'
-require 'relish/commands/projects'
 require 'relish/commands/help'
+require 'relish/commands/projects'
+require 'relish/commands/push'
 
 module Relish
   module Command

data/lib/relish/commands/base.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'json'
 require 'relish/ui'
 require 'relish/options_file'
 require 'relish/commands/dsl'
@@ -81,6 +82,14 @@ module Relish
         @ui ||= Ui.new
       end
       
+      def json_parse(response, &block)
+        JSON.parse(response).inject([]) do |parsed_output, hash|
+          parsed_output << block.call(hash)
+        end.join("\n")
+      rescue JSON::ParserError
+        response
+      end
+      
     end
   end
 end

data/lib/relish/commands/collab.rb

@@ -0,0 +1,44 @@
+module Relish
+  module Command
+    class Collab < Base
+      
+      desc    'list the collaborators for a project'
+      command :default do
+        puts format(resource[resource_path].get(:accept => :json))
+      end
+      
+      usage   'collab:add <org_or_user_handle>/<project_handle>:' +
+              '<collaborator_handle_or_email>'
+      desc    ['add a collaborator to a project',
+               'example: relish collab:add rspec/rspec-core:justin'].join("\n")
+      command :add do
+        puts resource[resource_path].post(:handle_or_email => handle_or_email)
+      end
+      
+      usage   'collab:remove <org_or_user_handle>/<project_handle>:' +
+              '<collaborator_handle_or_email>'
+      desc    ['remove a collaborator from a project',
+               'example: relish collab:remove rspec/rspec-core:justin'].join("\n")
+      command :remove do
+        puts resource["#{resource_path}/#{handle_or_email}"].delete
+      end
+      
+    private
+    
+      def resource_path
+        "projects/#{@param.remove_option}/memberships"
+      end
+      
+      def handle_or_email
+        @param.extract_option
+      end
+    
+      def format(response)
+        json_parse(response) do |hash|
+          "#{hash['user']['handle']} (#{hash['user']['email']})"
+        end
+      end
+      
+    end
+  end
+end

data/lib/relish/commands/config.rb

@@ -3,11 +3,7 @@ module Relish
     class Config < Base
       
       desc    'display the contents of your options file'
-      command :default => :show
-      
-      usage   'config:show'
-      desc    'display the contents of your options file'
-      command :show do
+      command :default do
         puts(if File.exists?(Relish.local_options_file)
           IO.read(Relish.local_options_file)
         else

data/lib/relish/commands/dsl.rb

@@ -1,4 +1,4 @@
-require 'relish/commands/dsl/base'
+require 'relish/commands/dsl/context_class'
 require 'relish/commands/dsl/option'
 require 'relish/commands/dsl/command'
 require 'relish/commands/dsl/help_text'

data/lib/relish/commands/dsl/command.rb

@@ -1,10 +1,11 @@
 module Relish
   module Command
     module Dsl
-      class Command < Base
+      class Command
+        include ContextClass
         
         def define(name, &block)
-          context_eval do
+          context_class_eval do
             define_method(name) do
               begin
                 instance_exec(&block)
@@ -14,7 +15,7 @@ module Relish
               end
             end
           end
-          HelpText.add(name, context_name)
+          HelpText.add(name, context_class_name)
         end
         
       end

data/lib/relish/commands/dsl/context_class.rb

@@ -0,0 +1,23 @@
+module Relish
+  module Command
+    module Dsl
+      module ContextClass
+        
+        attr_reader :context_class
+        
+        def initialize(context_class)
+          @context_class = context_class
+        end
+        
+        def context_class_eval(&block)
+          context_class.class_eval(&block)
+        end
+        
+        def context_class_name
+          context_class.name.split('::').last.downcase
+        end
+        
+      end
+    end
+  end
+end

data/lib/relish/commands/dsl/help_text.rb

@@ -34,6 +34,12 @@ module Relish
           def clear_commands
             @commands = {}
           end
+          
+          def max_usage_length
+            commands.values.map {|v|
+              v.map {|v| v.keys.to_s.length }.max
+            }.max
+          end
         end
         
       end

data/lib/relish/commands/dsl/option.rb

@@ -1,13 +1,14 @@
 module Relish
   module Command
     module Dsl
-      class Option < Base
+      class Option
+        include ContextClass
         
         def define(name, options = {})
           name = name.to_s
           default_proc = options[:default] || Proc.new {}
 
-          context_eval do
+          context_class_eval do
             define_method(name) do
               cli_options[name] ||
               local_options_file[name] ||

data/lib/relish/commands/help.rb

@@ -1,29 +1,46 @@
-require 'yaml'
-
 module Relish
   module Command
     class Help < Base
       
-      desc    'show this usage'
+      desc 'show this usage'
       command :default do
         puts "=== Available Commands\n\n"
-
         Dsl::HelpText.commands.each do |command, list|
-          list.each do |hash|
-            usage, description = *hash.to_a.flatten
-            usage = command if usage == 'default'
-            puts "#{usage.ljust(max_command_length)} # #{description}"
-          end
+          list.each {|hash| Formatter.new(command, hash).format }
         end
       end
       
-    private
+      class Formatter
+        attr_reader :command, :usage, :description
+        
+        def initialize(command, hash)
+          @command = command
+          @usage, @description = *hash.to_a.flatten
+        end
+        
+        def usage
+          @usage == 'default' ? @command : @usage
+        end
+      
+        def format        
+          description.split("\n").each_with_index do |part, index|
+            puts "#{format_usage(index)} # #{part}"
+          end
+        end
+      
+        def format_usage(index)
+          if index.zero?
+            usage.ljust(max_usage_length)
+          else
+            " " * max_usage_length
+          end
+        end
       
-      def max_command_length
-        Dsl::HelpText.commands.values.map {|v|
-          v.map {|v| v.keys.to_s.length }.max
-        }.max
+        def max_usage_length
+          Dsl::HelpText.max_usage_length
+        end
       end
+        
     end
   end
 end

data/lib/relish/commands/projects.rb

@@ -1,24 +1,18 @@
-require 'rubygems'
-require 'json'
-
 module Relish
   module Command
     class Projects < Base
-      
-      desc    'list your projects'
-      command :default => :list
-      
-      usage   'projects:list'
+
       desc    'list your projects'
-      command :list do
-        response = resource['projects'].get(:accept => :json)
-        puts format(response)
+      command :default do
+        puts format(resource['projects'].get(:accept => :json))
       end
       
       usage   'projects:add <org_or_user_handle>/<project_handle>'
-      desc    'add a project'
+      desc    ['add a project',
+               'append :private to make the project private',
+               'example: relish projects:add rspec/rspec-core:private'].join("\n")
       command :add do
-        puts resource['projects'].post(:handle => @param)
+        puts resource['projects'].post(:handle => handle, :private => private?)
       end
       
       usage   'projects:remove <org_or_user_handle>/<project_handle>'
@@ -29,12 +23,19 @@ module Relish
       
     private
       def format(response)
-        json = JSON.parse(response)
-        json.map do |hash| 
+        json_parse(response) do |hash| 
           result = hash['project']['full_handle']
           result << " (private)" if hash['project']['private']
           result
-        end.join("\n")
+        end
+      end
+      
+      def handle
+        @param.remove_option
+      end
+      
+      def private?
+        @param.extract_option == 'private'
       end
             
     end

data/lib/relish/commands/push.rb

@@ -1,9 +1,7 @@
-require 'rubygems'
 require 'zlib'
 require 'archive/tar/minitar'
 require 'stringio'
 require 'rest_client'
-require 'relish/commands/help'
 
 module Relish
   module Command    

data/lib/relish/core_ext.rb

@@ -0,0 +1,15 @@
+module Relish
+  module StringExtensions
+    def extract_option
+      split(':')[1]
+    end
+    
+    def remove_option
+      split(':')[0]
+    end
+  end
+end
+
+class String
+  include Relish::StringExtensions
+end

data/relish.gemspec

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

data/spec/relish/commands/config_spec.rb

@@ -4,16 +4,8 @@ module Relish
   module Command
     describe Config do
       
-      describe '#default' do
-        let(:config) { described_class.new }
-        
-        it 'calls #show' do
-          config.should_receive(:show)
-          config.default
-        end
-      end
       
-      describe '#show' do
+      describe '#default' do
         let(:config) { described_class.new }
         
         context 'with a local options file' do
@@ -24,14 +16,14 @@ module Relish
           
           it 'outputs the contents' do
             config.should_receive(:puts).with('options')
-            config.show
+            config.default
           end
         end
         
         context 'without a local options file' do
           it 'outputs the correct message' do
             config.should_receive(:puts).with('No .relish file exists')
-            config.show
+            config.default
           end
         end
       end

data/spec/relish/commands/dsl/command_spec.rb

@@ -5,6 +5,8 @@ module Relish
     module Dsl
       describe Command do
         
+        it_should_behave_like 'a Dsl that utilizes ContextClass'
+        
         describe '#define' do
           let(:context_class) { Class.new }
           let(:command) { described_class.new(context_class) }

data/spec/relish/commands/dsl/option_spec.rb

@@ -5,6 +5,8 @@ module Relish
     module Dsl
       describe Option do
         
+        it_should_behave_like 'a Dsl that utilizes ContextClass'
+        
         describe '#define' do
           let(:context_class) { Class.new }
           let(:option) { described_class.new(context_class) }

data/spec/relish/commands/projects_spec.rb

@@ -2,17 +2,6 @@ require 'spec_helper'
 
 module Relish
   module Command
-    describe Projects do
-      
-      describe '#default' do
-        let(:projects) { described_class.new }
-        
-        it 'calls #list' do
-          projects.should_receive(:list)
-          projects.default
-        end
-      end 
-      
-    end
+    
   end
 end

data/spec/relish/core_ext_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe String do
+  describe '#extract_option' do
+    specify { 'foo:bar'.extract_option.should eq('bar') }
+  end
+  
+  describe '#remove_option' do
+    specify { 'foo:bar'.remove_option.should eq('foo') }
+  end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,8 @@ Bundler.setup
 
 require 'relish/command'
 
+Dir['./spec/support/*.rb'].map {|f| require f }
+
 RSpec.configure do |config|
   config.color_enabled = true
-
 end

data/spec/support/context_class_examples.rb

@@ -0,0 +1,24 @@
+shared_examples_for 'a Dsl that utilizes ContextClass' do
+
+  describe '#context_class_eval' do
+    let(:context_class) { Class.new }
+    let(:base) { described_class.new(context_class) }
+    let(:the_block) { Proc.new { "Hi, I'm a block" } }
+  
+    it 'calls class_eval on the context_class with the given block' do
+      context_class.should_receive(:class_eval).with(&the_block)
+      base.context_class_eval(&the_block)
+    end
+  end
+
+  describe '#context_class_name' do
+    let(:context_class) { Class.new }
+    let(:base) { described_class.new(context_class) }
+    before { context_class.should_receive(:name).and_return('::Dog') }
+  
+    it 'returns the class name downcased' do
+      base.context_class_name.should eq('dog')
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matt Wynne
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -06:00
+date: 2010-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -189,15 +189,17 @@ files:
 - lib/relish.rb
 - lib/relish/command.rb
 - lib/relish/commands/base.rb
+- lib/relish/commands/collab.rb
 - lib/relish/commands/config.rb
 - lib/relish/commands/dsl.rb
-- lib/relish/commands/dsl/base.rb
 - lib/relish/commands/dsl/command.rb
+- lib/relish/commands/dsl/context_class.rb
 - lib/relish/commands/dsl/help_text.rb
 - lib/relish/commands/dsl/option.rb
 - lib/relish/commands/help.rb
 - lib/relish/commands/projects.rb
 - lib/relish/commands/push.rb
+- lib/relish/core_ext.rb
 - lib/relish/helpers.rb
 - lib/relish/options_file.rb
 - lib/relish/ui.rb
@@ -205,15 +207,16 @@ files:
 - spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
 - spec/relish/commands/config_spec.rb
-- spec/relish/commands/dsl/base_spec.rb
 - 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/projects_spec.rb
 - spec/relish/commands/push_spec.rb
+- spec/relish/core_ext_spec.rb
 - spec/relish/options_file_spec.rb
 - spec/relish_spec.rb
 - spec/spec_helper.rb
+- spec/support/context_class_examples.rb
 has_rdoc: true
 homepage: http://relishapp.com
 licenses: []
@@ -261,12 +264,13 @@ test_files:
 - spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
 - spec/relish/commands/config_spec.rb
-- spec/relish/commands/dsl/base_spec.rb
 - 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/projects_spec.rb
 - spec/relish/commands/push_spec.rb
+- spec/relish/core_ext_spec.rb
 - spec/relish/options_file_spec.rb
 - spec/relish_spec.rb
 - spec/spec_helper.rb
+- spec/support/context_class_examples.rb

data/lib/relish/commands/dsl/base.rb

@@ -1,23 +0,0 @@
-module Relish
-  module Command
-    module Dsl
-      class Base
-        
-        attr_reader :context
-        
-        def initialize(context)
-          @context = context
-        end
-        
-        def context_eval(&block)
-          context.class_eval(&block)
-        end
-        
-        def context_name
-          context.name.split('::').last.downcase
-        end
-        
-      end
-    end
-  end
-end

data/spec/relish/commands/dsl/base_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-module Relish
-  module Command
-    module Dsl
-      describe Base do
-        
-        describe '#context_eval' do
-          let(:context_class) { Class.new }
-          let(:base) { described_class.new(context_class) }
-          let(:the_block) { Proc.new { "Hi, I'm a block" } }
-          
-          it 'calls class_eval on the context_class with the given block' do
-            context_class.should_receive(:class_eval).with(&the_block)
-            base.context_eval(&the_block)
-          end
-        end
-        
-        describe '#context_name' do
-          let(:context_class) { Class.new }
-          let(:base) { described_class.new(context_class) }
-          before { context_class.should_receive(:name).and_return('::Dog') }
-          
-          it 'returns the class name downcased' do
-            base.context_name.should eq('dog')
-          end
-        end
-        
-      end
-    end
-  end
-end