relish 0.2.0 → 0.2.1

data/features/help.feature

@@ -1,9 +1,9 @@
 @announce
 Feature: Help
-  
+
   The `relish help` command displays all available commands
   along with a description of each.
-  
+
   Scenario: View all available commands with the help command
     When I successfully run "relish help"
     Then the output should contain exactly:
@@ -15,7 +15,7 @@ Feature: Help
 
       If you leave off the organization or user handle, then it defaults
       to the user (you).
-      
+
       === Available Commands
 
       help                                                   # show this usage
@@ -32,10 +32,12 @@ Feature: Help
                                                              # 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>:<version>                               # push features to relishapp.com
+      push <project>:<version>                               # push features to a project
                                                              # <version> is optional
                                                              # example: relish push rspec/rspec-core
                                                              # example: relish push rspec/rspec-core:2.0
+      push:org <organization handle>                         # push markdown files to an organization
+                                                             # example: relish push:org rspec
       collab                                                 # list the collaborators for a project
       collab:add <project>:<collaborator handle or email>    # add a collaborator to a project
                                                              # example: relish collab:add rspec/rspec-core:justin
@@ -46,13 +48,13 @@ Feature: Help
                                                              # example: relish versions:add rspec/rspec-core:2.0
       versions:remove <project>:<version>                    # remove a version from a project
                                                              # example: relish versions:remove rspec/rspec-core:2.0
-      
+
       """
-      
+
   Scenario: Specifying no command runs the help command
     When I successfully run "relish"
     Then the output should contain "=== Available Commands"
-    
+
   Scenario: Specifying an unknown command gives an error message
     When I run "relish baloney"
     Then it should fail with:

data/lib/relish/commands/base.rb

@@ -12,13 +12,13 @@ module Relish
     class Base
       include Relish::Helpers
       extend Dsl
-      
+
       option :api_token, :default => lambda { get_and_store_api_token }
       option :host,      :default => lambda { Relish.default_host }
-      
+
       attr_writer :args
       attr_reader :cli_options
-            
+
       def initialize(args = [])
         @args = clean_args(args)
         @param = get_param.extend(ParamMethods)
@@ -26,17 +26,17 @@ module Relish
 
         validate_cli_options
       end
-      
+
       def url
         "http://#{host}/api"
       end
-      
+
       def get_param
         @args.shift if @args.size.odd?
       end
 
     private
-    
+
       def project
         merged_options['project'] || error(:project_blank)
       end
@@ -46,28 +46,28 @@ module Relish
         global_options_file.store('api_token' => api_token)
         api_token
       end
-      
+
       def get_api_token
         email, password = ui.get_credentials
-        
+
         raw_response = resource(:user => email, :password => password)['token'].get
         String.new(raw_response.to_s)
       end
-      
+
       def resource(options = {})
         options[:user] ||= api_token
         options[:password] ||= 'X'
         RestClient::Resource.new(url, options)
       end
-      
+
       def clean_args(args)
         args.inject([]) {|cleaned, arg| cleaned << arg.sub('--', '') }
       end
-      
+
       def valid_option_names
         Dsl::Option.names
       end
-      
+
       def validate_cli_options
         cli_options.keys.each do |option|
           unless valid_option_names.include?(option.to_s)
@@ -75,11 +75,11 @@ module Relish
           end
         end
       end
-      
+
       def merged_options
         @merged_options ||= global_options_file.merge(local_options_file)
       end
-      
+
       def global_options_file
         @global_options ||= OptionsFile.new(Relish.global_options_file)
       end
@@ -87,11 +87,11 @@ module Relish
       def local_options_file
         @local_options ||= OptionsFile.new(Relish.local_options_file)
       end
-      
+
       def ui
         @ui ||= Ui.new
       end
-      
+
       def json_parse(response, &block)
         JSON.parse(response).inject([]) do |parsed_output, hash|
           parsed_output << block.call(hash)
@@ -99,11 +99,11 @@ module Relish
       rescue JSON::ParserError
         response
       end
-      
+
       def escape(str)
         CGI.escape(str)
       end
-      
+
     end
   end
 end

data/lib/relish/commands/collab.rb

@@ -3,38 +3,38 @@ module Relish
     class Collab < Base
       include ResourceMethods
       resource_path :memberships
-      
+
       desc    'list the collaborators for a project'
       command :default do
         puts format(resource[resource_path_for_no_option].get(:accept => :json))
       end
-      
+
       usage   'collab:add <project>:<collaborator handle or email>'
-      desc    ['add a collaborator to a project',
-               'example: relish collab:add rspec/rspec-core:justin']
+      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>'
-      desc    ['remove a collaborator from a project',
-               'example: relish collab:remove rspec/rspec-core:justin']
+      desc    'remove a collaborator from a project',
+              'example: relish collab:remove rspec/rspec-core:justin'
       command :remove do
         puts resource["#{resource_path_for_option}/#{handle_or_email}"].delete
       end
-      
+
     private
-      
+
       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

@@ -1,22 +1,22 @@
 module Relish
   module Command
     class Config < Base
-      
+
       class Option
         VALID_OPTIONS = %w(project)
-        
+
         def initialize(param)
           @option, @value = param.split(':')
           validate_option
         end
-        
+
         def validate_option
           unless VALID_OPTIONS.include?(@option)
             Relish::Helpers.error "'#{@option}' is not a valid option." +
                                   " Valid options: #{VALID_OPTIONS.join(', ')}"
           end
         end
-        
+
         def to_hash
           {@option => @value}
         end
@@ -30,16 +30,16 @@ module Relish
           "No #{Relish.local_options_file} file exists"
         end)
       end
-      
+
       usage   'config:add <option>:<value>'
-      desc    ['add a configuration option to your options file',
-               'example: relish config:add project:rspec-core',
-               "valid configuration options: #{Option::VALID_OPTIONS.join(', ')}"]
+      desc    'add a configuration option to your options file',
+              'example: relish config:add project:rspec-core',
+              "valid configuration options: #{Option::VALID_OPTIONS.join(', ')}"
       command :add do
         option = Option.new(@param)
         OptionsFile.new(Relish.local_options_file).store(option.to_hash)
       end
-      
+
     end
   end
 end

data/lib/relish/commands/dsl.rb

@@ -6,21 +6,20 @@ require 'relish/commands/dsl/help_text'
 module Relish
   module Command
     module Dsl
-      
+
       def option(name, options = {})
         Option.new(self).define(name, options)
         Option.names << name.to_s
       end
-      
+
       def usage(text)
         HelpText.next_usage = text
       end
-      
-      def desc(text)
-        text = text.join("\n") if text.is_a?(Array)
-        HelpText.next_description = text
+
+      def desc(*text)
+        HelpText.next_description = text.join("\n")
       end
-      
+
       def command(arg, &block)
         case arg
         when Hash
@@ -31,10 +30,10 @@ module Relish
         else
           raise ArgumentError
         end
-        
+
         Command.new(self).define(name, &block)
       end
-      
+
     end
   end
 end

data/lib/relish/commands/projects.rb

@@ -1,75 +1,75 @@
 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>'
-      desc    ['add a project',
-               'append :private to make the project private',
-               'example: relish projects:add rspec/rspec-core:private']
+      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_to_add, :private => private?)
       end
-      
+
       usage   'projects:remove <project>'
       desc    'remove a project'
       command :remove do
         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']
+      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']
+      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| 
+        json_parse(response) do |hash|
           result = hash['project']['full_handle']
           result << " (private)" if hash['project']['private']
           result
         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 if @param
       end
-      
+
       def rename_handle
         @param.has_option? ? @param.extract_option : error(:handle_blank)
       end
-      
+
       def private?
         @param.extract_option == 'private'
       end
-            
+
     end
   end
 end

data/lib/relish/commands/push.rb

@@ -4,41 +4,52 @@ require 'stringio'
 require 'rest_client'
 
 module Relish
-  module Command    
+  module Command
     class Push < Base
-            
+
       usage   'push <project>:<version>'
-      desc    ['push features to relishapp.com',
-               '<version> is optional',
-               'example: relish push rspec/rspec-core',
-               'example: relish push rspec/rspec-core:2.0']
+      desc    'push features to a project',
+              '<version> is optional',
+              'example: relish push rspec/rspec-core',
+              'example: relish push rspec/rspec-core:2.0'
       command :default do
-        post files_as_tar_gz
+        post files_as_tar_gz, project_params
+      end
+
+      usage   'push:org <organization handle>'
+      desc    'push markdown files to an organization',
+              'example: relish push:org rspec'
+      command :org do
+        post files_as_tar_gz, organization_params
       end
-      
+
     private
-          
-      def post(tar_gz_data)
-        resource["pushes?#{parameters}"].post(tar_gz_data,
+
+      def post(tar_gz_data, params)
+        resource["pushes?#{params}"].post(tar_gz_data,
           :content_type => 'application/x-gzip')
         puts "sent:\n#{files.join("\n")}"
       end
-      
-      def parameters
+
+      def project_params
         "".tap do |str|
           str << "project_id=#{project}"
           str << "&version_id=#{version}" if version
         end
       end
-      
+
+      def organization_params
+        "organization_id=#{@param}"
+      end
+
       def project
         (@param.without_option if @param) || super()
       end
-      
+
       def version
         @param.extract_option if @param.has_option?
       end
-      
+
       def files_as_tar_gz
         stream = StringIO.new
         begin
@@ -52,14 +63,14 @@ module Relish
         end
         stream.string
       end
-      
+
       def files
         Dir["features/**/*.{feature,md,markdown}"] +
         Dir["features/**/.nav"]
       end
-      
+
     end
-    
+
 
   end
 end

data/lib/relish/commands/versions.rb

@@ -3,40 +3,40 @@ module Relish
     class Versions < Base
       include ResourceMethods
       resource_path :versions
-      
+
       desc    'list the versions for a project'
       command :default do
         puts format(resource[resource_path_for_no_option].get(:accept => :json))
       end
 
       usage   'versions:add <project>:<version>'
-      desc    ['add a version to a project',
-               'example: relish versions:add rspec/rspec-core:2.0']
+      desc    'add a version to a project',
+              'example: relish versions:add rspec/rspec-core:2.0'
       command :add do
         puts resource[resource_path_for_option].post(
           :version => { :name => version_name }
         )
       end
-      
+
       usage   'versions:remove <project>:<version>'
-      desc    ['remove a version from a project',
-               'example: relish versions:remove rspec/rspec-core:2.0']
+      desc    'remove a version from a project',
+              'example: relish versions:remove rspec/rspec-core:2.0'
       command :remove do
         puts resource["#{resource_path_for_option}/#{version_name}"].delete
       end
-      
+
     private
-      
+
       def version_name
         @param && @param.extract_option || error(:version_blank)
       end
-    
+
       def format(response)
         json_parse(response) do |hash|
           "#{hash['version']['name']}"
         end
       end
-      
+
     end
   end
 end

data/relish.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "relish"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = '>= 1.3.5'
   s.authors = ["Matt Wynne", "Justin Ko"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.rubygems_version = "1.3.6"
   s.summary = %q{Client gem for http://relishapp.com}
-  
+
   s.require_path = "lib"
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {spec,features}/*`.split("\n")
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end
-  
+
   {
     'bundler'             => '~> 1.0.0',
     'rake'                => '~> 0.8.7',

data/spec/relish/commands/config_spec.rb

@@ -3,23 +3,22 @@ require 'spec_helper'
 module Relish
   module Command
     describe Config do
-      
-      
+
       describe '#default' do
         let(:config) { described_class.new }
-        
+
         context 'with a local options file' do
           before do
             File.should_receive(:exists?).and_return(true)
             IO.should_receive(:read).and_return('options')
           end
-          
+
           it 'outputs the contents' do
             config.should_receive(:puts).with('options')
             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')
@@ -27,7 +26,7 @@ module Relish
           end
         end
       end
-      
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Matt Wynne
@@ -212,8 +212,6 @@ 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/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
@@ -252,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Client gem for http://relishapp.com
@@ -269,8 +267,6 @@ 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/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

data/spec/relish/commands/projects_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-module Relish
-  module Command
-    
-  end
-end

data/spec/relish/commands/push_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-module Relish
-  module Command
-    describe Push do
-      
-      describe '#default' do
-        let(:push) { described_class.new }
-        
-        it 'calls #post' do
-          push.should_receive(:post)
-          push.default
-        end
-      end
-      
-    end
-  end
-end