relish 0.0.1 → 0.0.2

data/.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 .rvmrc
 *.gem
-tmp
+tmp
+Gemfile.lock

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008,2009 Matt Patterson, Matt Wynne, Justin Ko
+Copyright (c) 2010 Matt Wynne, Justin Ko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -5,4 +5,9 @@ Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new
+
+task :default => [:spec, :cucumber]

data/bin/relish

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
+require 'relish/command'
+
 args = ARGV.dup
 ARGV.clear
 command = args.shift.strip rescue 'help'
 
-Relish::Cli::Runner.run(command, $stderr, $stdout)
+Relish::Command.run(command, args)

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress

data/features/push.feature

@@ -1,8 +1,12 @@
+@announce
 Feature: Push
-  As a Relish user
-  In order to push my features to the Relish server
-  I want to run the relish push command
+  In order to send my features to relishapp.com
+  As a Relish user dev
+  I want a push command
   
-  Scenario: Push one feature file to a project
-    Given pending
-  
+  Background:
+    Given my API token "1234" is stored
+  
+  Scenario: Specify everything at the command-line
+    When I run relish push --host localhost:1234 --project p
+    When it should POST to "http://localhost:1234/pushes?project_id=p&api_token=1234"

data/features/step_definitions/aruba.rb

@@ -0,0 +1,7 @@
+require 'aruba'
+gem_bin_path = File.dirname(__FILE__) + '/../../bin'
+ENV['PATH'] = "#{gem_bin_path}:#{ENV['PATH']}"
+
+When /^I run relish ([^\s]*) (.*)$/ do |command, args|
+  Relish::Command.run(command, args.split(" "))
+end

data/features/step_definitions/fake_web_steps.rb

@@ -0,0 +1,8 @@
+require 'fake_web'
+FakeWeb.allow_net_connect = false
+FakeWeb.register_uri(:any, /.*/, :body => "Faked HTTP response")
+
+When /^it should POST to "http:\/\/localhost:1234([^"]*)"$/ do |path|
+  request = FakeWeb.last_request || raise("Fakeweb did not record a request.")
+  request.path.should == path
+end

data/features/step_definitions/relish_steps.rb

@@ -0,0 +1,6 @@
+Given /^my API token "([^"]*)" is stored$/ do |api_token|
+  # yeah! dirty hack
+  Relish::Command::Base.class_eval do
+    define_method(:api_token) { api_token }
+  end
+end

data/features/support/env.rb

@@ -1 +1,4 @@
-require 'aruba'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'relish/command'
+
+Relish::Command::Base::GLOBAL_OPTIONS_FILE = '~/.relish'

data/lib/relish/command.rb

@@ -1,2 +1,18 @@
 require 'relish/commands/base'
-require 'relish/commands/push'
+require 'relish/commands/push'
+
+module Relish
+  module Command
+    
+    def self.run(command, args)
+      command_class, method = get_command_and_method(command, args)      
+      command_class.new(args).send(method)
+    end
+    
+    def self.get_command_and_method(command, args)
+      command_class, method = command.split(':')
+      return Relish::Command.const_get(command_class.capitalize), (method || :default)
+    end
+    
+  end
+end

data/lib/relish/commands/base.rb

@@ -1,41 +1,45 @@
-require 'trollop'
+require 'yaml'
 
 module Relish
   module Command
     class Base
-      include Relish::Helpers
-      
       DEFAULT_HOST = 'relishapp.com'
+      GLOBAL_OPTIONS_FILE = File.join(File.expand_path('~'), '.relish')
       LOCAL_OPTIONS_FILE = '.relish'
       
-      def initialize(global_options = {})
-        @options = global_options
+      attr_reader :args
+      
+      def initialize(args)
+        @args = args
+        @options = get_options
       end
       
-      [:account, :project].each do |meth|
-        define_method meth do
-          @options[meth] || parse_options_file[meth]
-        end
+      def organization
+        @options['--organization'] || @options['-o'] || parsed_options_file['organization']
       end
       
-      def host
-        @options[:host] || DEFAULT_HOST
+      def project
+        @options['--project'] || @options['-p'] || parsed_options_file['project']
       end
       
-      def parse_options_file
-        @parsed_options_file ||= begin
-          if File.exist?(LOCAL_OPTIONS_FILE)
-            parser = Trollop::Parser.new
-            parser.opt :account, "", :short => '-a', :type => String
-            parser.opt :project, "", :short => '-p', :type => String
-            parser.opt :version, "", :short => '-v', :type => String
-            parser.parse(File.read(LOCAL_OPTIONS_FILE).split)
-          else {} end
-        end
+      def host
+        @options['--host'] || DEFAULT_HOST
       end
       
       def api_token
-        File.read("#{home_directory}/.relish/api_token")
+        parsed_options_file['api_token']
+      end
+      
+      def get_options
+        parsed_options_file.merge(Hash[*args])
+      end
+      
+      def parsed_options_file
+        @parsed_options_file ||= {}.tap do |parsed_options|
+          [GLOBAL_OPTIONS_FILE, LOCAL_OPTIONS_FILE].each do |options_file|
+            parsed_options.merge!(YAML.load_file(options_file)) if File.exist?(options_file)
+          end
+        end
       end
       
     end

data/lib/relish/commands/config.rb

@@ -0,0 +1,10 @@
+module Relish
+  module Command
+    class Config < Base
+      
+      def default
+      end
+      
+    end
+  end
+end

data/lib/relish/commands/push.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'zlib'
 require 'archive/tar/minitar'
 require 'stringio'
@@ -7,6 +8,10 @@ module Relish
   module Command
     class Push < Base
       
+      def default
+        run
+      end
+      
       def run
         post files_as_tar_gz
       end
@@ -15,10 +20,7 @@ module Relish
         resource = RestClient::Resource.new(url)
         resource.post(tar_gz_data, :content_type => 'application/x-gzip')
         puts "sent:\n#{files.join("\n")}"
-      rescue RestClient::ResourceNotFound,
-             RestClient::Unauthorized,
-             RestClient::BadRequest => exception
-             
+      rescue RestClient::Exception => exception
         warn exception.response
         exit 1
       end
@@ -26,7 +28,7 @@ module Relish
       def url
         "".tap do |str|
           str << "http://#{host}/pushes?"
-          str << "account_id=#{account}&"
+          str << "creator_id=#{organization}&" if organization
           str << "project_id=#{project}&"
           str << "version_id=#{version}&" if version
           str << "api_token=#{api_token}"
@@ -34,7 +36,7 @@ module Relish
       end
       
       def version
-        @options[:version]
+        @options['--version'] || @options['-v']
       end
       
       def files_as_tar_gz
@@ -52,7 +54,7 @@ module Relish
       end
       
       def files
-        Dir['features/**/*.{feature,md}']
+        Dir['features/**/*.{feature,md,markdown}']
       end
       
     end

data/relish.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = "relish"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = '>= 1.3.5'
-  s.authors = ["Matt Patterson", "Matt Wynne", "Justin Ko"]
+  s.authors = ["Matt Wynne", "Justin Ko"]
   s.date = "2010-09-23"
   s.description = %q{Client gem for http://relishapp.com}
   s.email = "jko170@gmail.com"
@@ -16,17 +16,23 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {spec,features}/*`.split("\n")
+  s.executables  = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  {
+    'archive-tar-minitar' => '~> 0.5.2',
+    'rest-client'         => '~> 1.6.1',
+  }.each do |lib, version|
+    s.add_runtime_dependency lib, version
+  end
   
   {
     'bundler'             => '~> 1.0.0',
     'rake'                => '~> 0.8.7',
-    'archive-tar-minitar' => '~> 0.5.2',
-    'rest-client'         => '~> 1.6.1',
-    'trollop'             => '~> 1.16.2',
-    'rspec'               => '~> 2.0.0.beta.22',
+    'rspec'               => '~> 2.0.0',
     'cucumber'            => '~> 0.9.1',
-    'aruba'               => '~> 0.2.2'
+    'aruba'               => '~> 0.2.2',
+    'fakeweb'             => '~> 1.3.0'
   }.each do |lib, version|
     s.add_development_dependency lib, version
   end
-end
+end

data/spec/relish/command_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Relish::Command do
+  
+  it "recognizes the 'push' command" do
+    push = double
+    push.should_receive(:default)
+    Relish::Command::Push.should_receive(:new).with([]).and_return(push)
+    Relish::Command.run('push', [])
+  end
+  
+end

data/spec/relish/commands/base_spec.rb

@@ -3,19 +3,40 @@ require 'spec_helper'
 module Relish
   module Command
     describe Base do
-      
-      {:account => 'rspec', :project => 'rspec-core'}.each do |meth, name|
+    
+      {:organization => 'rspec', :project => 'rspec-core'}.each do |meth, name|
         describe "##{meth}" do
-          context 'passed in command line' do
-            let(:base) { described_class.new({meth => name}) }
+          context 'passed in command line as full arg' do
+            let(:base) { described_class.new(["--#{meth}", name]) }
+          
+            it 'returns the value' do
+              base.send(meth).should eq(name)
+            end
+          end
+          
+          context 'passed in command line as short arg' do
+            let(:short_arg) { meth.to_s[0,1] }
+            let(:base) { described_class.new(["-#{short_arg}", name]) }
+          
+            it 'returns the value' do
+              base.send(meth).should eq(name)
+            end
+          end
           
+          context 'contained in the options file' do
+            let(:base) { described_class.new([]) }
+            
+            before do
+              base.stub(:parsed_options_file).and_return({meth.to_s => name})
+            end
+            
             it 'returns the value' do
               base.send(meth).should eq(name)
             end
           end
         
           context 'not passed in command line' do
-            let(:base) { described_class.new }
+            let(:base) { described_class.new([]) }
           
             context 'and options file does not exist' do
               it 'returns nil' do
@@ -28,7 +49,7 @@ module Relish
       
       describe '#host' do
         context 'passed in command line' do
-          let(:base) { described_class.new({:host => 'test.com'}) }
+          let(:base) { described_class.new(['--host', 'test.com']) }
           
           it 'returns test.com' do
             base.host.should eq('test.com')
@@ -36,7 +57,7 @@ module Relish
         end
         
         context 'not passed in command line' do
-          let(:base) { described_class.new }
+          let(:base) { described_class.new([]) }
           
           it 'returns the default host' do
             base.host.should eq(Base::DEFAULT_HOST)
@@ -44,25 +65,53 @@ module Relish
         end
       end
       
-      describe '#parse_options_file' do
-        let(:base) { described_class.new }
+      describe '#api_token' do
+        let(:base) { described_class.new([]) }
+        let(:options) { {'api_token' => '12345'} }
+        
+        before do
+          base.should_receive(:parsed_options_file).and_return(options)
+        end
+        
+        it 'parses the api token' do
+          base.api_token.should eq('12345')
+        end
+      end
+      
+      describe '#get_options' do
+        let(:base) { described_class.new(['--project', 'rspec-core']) }
+        let(:options) { {'project' => 'rspec-core'} }
+        
+        before do
+          base.should_receive(:parsed_options_file).and_return(options)
+        end
+        
+        it 'combines the args and options file' do
+          base.get_options.should eq(
+            {'project' => 'rspec-core', '--project' => 'rspec-core'}
+          )
+        end
+      end
+      
+      describe '#parsed_options_file' do
+        let(:base) { described_class.new([]) }
         
         context 'with options file that exists' do
           let(:options) do
-            '--account rspec --project rspec-core'
+            {'organization' => 'rspec', 'project' => 'rspec-core'}
           end
           
           before do
-            File.stub(:exist?).and_return(true)
-            File.stub(:read).and_return(options)
+            File.should_receive(:exist?).twice.and_return(true)
+            YAML.should_receive(:load_file).twice.and_return(options)
           end
           
-          it 'parses the account' do
-            base.parse_options_file[:account].should eq('rspec')
+          it 'parses the organization' do
+            base.parsed_options_file['organization'].should eq('rspec')
           end
           
           it 'parses the project' do
-            base.parse_options_file[:project].should eq('rspec-core')
+            base.parsed_options_file['project'].should eq('rspec-core')
           end
         end
         
@@ -72,21 +121,11 @@ module Relish
           end
           
           it 'returns an empty hash' do
-            base.parse_options_file.should eq({})
+            base.parsed_options_file.should eq({})
           end
         end
       end
       
-      describe '#api_token' do
-        let(:base) { described_class.new }
-        
-        it 'calls File.read with the correct path' do
-          base.should_receive(:home_directory).and_return('~')
-          File.should_receive(:read).with('~/.relish/api_token')
-          base.api_token
-        end
-      end
-      
     end
   end
 end

data/spec/relish/commands/push_spec.rb

@@ -4,55 +4,62 @@ module Relish
   module Command
     describe Push do
       
+      describe '#default' do
+        let(:push) { described_class.new([]) }
+        
+        it 'calls #run' do
+          push.should_receive(:run)
+          push.default
+        end
+      end
+      
       describe '#url' do
         before do
-          push.should_receive(:account).and_return('rspec')
           push.should_receive(:project).and_return('rspec')
           push.should_receive(:api_token).and_return('abc')
         end
         
         context 'without version' do 
-          let(:push) { described_class.new }
+          let(:push) { described_class.new([]) }
           
           specify do
             push.url.should eq(
-              "http://relishapp.com/pushes?account_id=rspec&project_id=rspec&api_token=abc"
+              "http://relishapp.com/pushes?project_id=rspec&api_token=abc"
             )
           end
         end
         
         context 'with version' do
-          let(:push) { described_class.new(:version => 'one') }
+          let(:push) { described_class.new(['--version', 'one']) }
           
           specify do
             push.url.should eq(
-              "http://relishapp.com/pushes?" \
-              "account_id=rspec&project_id=rspec&version_id=one&api_token=abc"
+              "http://relishapp.com/pushes?project_id=rspec&version_id=one&api_token=abc"
             )
           end
         end
       end
       
       describe '#version' do
-        context 'with :version in @options' do
-          let(:push) { described_class.new(:version => 'one') }
+        context 'with --version in @options' do
+          let(:push) { described_class.new(['--version', 'one']) }
           specify { push.version.should eq('one') }
         end
         
-        context 'with :version not in @options' do
-          let(:push) { described_class.new }
+        context 'with --version not in @options' do
+          let(:push) { described_class.new([]) }
           specify { push.version.should be_nil }
         end
       end
       
       describe '#files_as_tar_gz' do
-        let(:push) { described_class.new }
+        let(:push) { described_class.new([]) }
         specify { expect { push.files_as_tar_gz }.to_not raise_exception }
         specify { push.files_as_tar_gz.should be_a(String) }
       end
       
       describe '#files' do
-        let(:push) { described_class.new }
+        let(:push) { described_class.new([]) }
         specify { expect { push.files }.to_not raise_exception }
         specify { push.files.should be_a(Array) }
       end

data/spec/spec_helper.rb

@@ -2,8 +2,12 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'relish'
+require 'relish/command'
 
 RSpec.configure do |config|
   config.color_enabled = true
+  
+  config.before(:suite) do
+    Relish::Command::Base::GLOBAL_OPTIONS_FILE = '~/.relish'
+  end
 end

metadata

@@ -1,121 +1,118 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- Matt Patterson
 - Matt Wynne
 - Justin Ko
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -04:00
+date: 2010-09-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 13
         segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: archive-tar-minitar
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 15
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
-  type: :development
+        - 5
+        - 2
+        version: 0.5.2
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        - 2
-        - 2
-        version: 0.2.2
+        version: 1.3.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 49
         segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
+        hash: 15
         segments: 
-        - 1
-        - 16
         - 2
-        version: 1.16.2
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
+  name: aruba
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 0
-        - 5
         - 2
-        version: 0.5.2
+        - 2
+        version: 0.2.2
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -152,8 +149,8 @@ dependencies:
   version_requirements: *id008
 description: Client gem for http://relishapp.com
 email: jko170@gmail.com
-executables: []
-
+executables: 
+- relish
 extensions: []
 
 extra_rdoc_files: []
@@ -161,21 +158,22 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/relish
+- cucumber.yml
 - features/push.feature
+- features/step_definitions/aruba.rb
+- features/step_definitions/fake_web_steps.rb
+- features/step_definitions/relish_steps.rb
 - features/support/env.rb
-- lib/relish.rb
-- lib/relish/cli/options.rb
-- lib/relish/cli/runner.rb
 - lib/relish/command.rb
 - lib/relish/commands/base.rb
+- lib/relish/commands/config.rb
 - lib/relish/commands/push.rb
-- lib/relish/helpers.rb
 - relish.gemspec
+- spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
 - spec/relish/commands/push_spec.rb
 - spec/spec_helper.rb
@@ -217,7 +215,11 @@ specification_version: 3
 summary: Client gem for http://relishapp.com
 test_files: 
 - features/push.feature
+- features/step_definitions/aruba.rb
+- features/step_definitions/fake_web_steps.rb
+- features/step_definitions/relish_steps.rb
 - features/support/env.rb
+- spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
 - spec/relish/commands/push_spec.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relish (0.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    archive-tar-minitar (0.5.2)
-    aruba (0.2.2)
-    builder (2.1.2)
-    cucumber (0.9.1)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.2.7)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-      trollop (~> 1.16.2)
-    json (1.4.6)
-    mime-types (1.16)
-    rake (0.8.7)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    term-ansicolor (1.0.5)
-    trollop (1.16.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  archive-tar-minitar (~> 0.5.2)
-  aruba (~> 0.2.2)
-  bundler (~> 1.0.0)
-  cucumber (~> 0.9.1)
-  rake (~> 0.8.7)
-  relish!
-  rest-client (~> 1.6.1)
-  rspec (~> 2.0.0.beta.22)
-  trollop (~> 1.16.2)

data/lib/relish.rb

@@ -1,2 +0,0 @@
-require 'relish/helpers'
-require 'relish/command'

data/lib/relish/cli/options.rb

@@ -1,51 +0,0 @@
-require 'trollop'
-require 'relish/commands/push'
-
-module Relish
-  module Cli
-    class OptionsParser < Trollop::Parser
-      
-      COMMANDS = { 'push' => Commands::Push }
-      
-      def initialize(error_stream, out_stream)
-        super
-        
-        banner "This is the relish gem. Valid commands are: #{valid_commands.join(",")}"
-        
-        opt :help,    "Show help information"
-        opt :host,    "Host to connect to",    :short => '-h', :type => String
-        opt :account, "Account to connect to", :short => '-a', :type => String
-        opt :project, "Project to connect to", :short => '-p', :type => String
-        opt :version, "Version to connect to", :short => '-v', :type => String
-        
-        stop_on valid_commands
-      end
-
-      def command(args)
-        Trollop.with_standard_exception_handling(self) do
-          global_options = parse(args)
-          grab_command(global_options)
-        end
-      end
-      
-    private
-    
-      def grab_command(global_options)
-        command_name = leftovers.shift
-        raise Trollop::HelpNeeded unless command_name
-        unless valid_commands.include?(command_name)
-          die("'#{command_name}' is not a relish command", nil)
-        end
-        command_class(command_name).new(global_options)
-      end
-      
-      def valid_commands
-        COMMANDS.keys
-      end
-      
-      def command_class(command_name)
-        COMMANDS[command_name] or raise(NotImplementedError)
-      end
-    end
-  end
-end

data/lib/relish/cli/runner.rb

@@ -1,12 +0,0 @@
-require 'relish/cli/options'
-
-module Relish
-  module Cli
-    class Runner
-      def self.run(args, error_stream, out_stream)
-        parser = OptionsParser.new(error_stream, out_stream)
-        parser.command(args).run
-      end
-    end
-  end
-end

data/lib/relish/helpers.rb

@@ -1,15 +0,0 @@
-module Relish
-  module Helpers
-    def home_directory
-      running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
-    end
-
-    def running_on_windows?
-      RUBY_PLATFORM =~ /mswin32|mingw32/
-    end
-
-    def running_on_a_mac?
-      RUBY_PLATFORM =~ /-darwin\d/
-    end
-  end
-end