relish 0.0.2 → 0.0.4

data/features/projects.feature

@@ -0,0 +1,16 @@
+@announce
+Feature: Projects
+  In order to add and delete projects
+  As a Relish user
+  I want to use the projects command
+  
+#   Background:
+#     Given my API token "1234" is stored
+#   
+#   Scenario: Listing all projects
+#     When I run relish projects --host localhost:1234
+#     Then it should GET to "http://localhost:1234/api/projects?api_token=1234"
+#   
+#   Scenario: Adding a project
+#     When I run relish projects:add rspec-core --host localhost:1234
+#     Then it should POST to "http://localhost:1234/api/projects?name=rspec-core&api_token=1234"

data/features/push.feature

@@ -9,4 +9,4 @@ Feature: Push
   
   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"
+    Then it should POST to "http://localhost:1234/api/pushes?project_id=p&api_token=1234"

data/features/step_definitions/fake_web_steps.rb

@@ -2,7 +2,7 @@ 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|
+Then /^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/support/env.rb

@@ -1,4 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'relish/command'
 
-Relish::Command::Base::GLOBAL_OPTIONS_FILE = '~/.relish'
+Relish::Command::Base.class_eval do
+  remove_const(:GLOBAL_OPTIONS_FILE)
+  const_set(:GLOBAL_OPTIONS_FILE, '~/.relish')
+end

data/lib/relish/command.rb

@@ -1,5 +1,8 @@
 require 'relish/commands/base'
 require 'relish/commands/push'
+require 'relish/commands/config'
+require 'relish/commands/projects'
+require 'relish/commands/help'
 
 module Relish
   module Command

data/lib/relish/commands/base.rb

@@ -7,10 +7,11 @@ module Relish
       GLOBAL_OPTIONS_FILE = File.join(File.expand_path('~'), '.relish')
       LOCAL_OPTIONS_FILE = '.relish'
       
-      attr_reader :args
+      attr_accessor :args
       
-      def initialize(args)
+      def initialize(args = [])
         @args = args
+        @param = get_param
         @options = get_options
       end
       
@@ -22,14 +23,22 @@ module Relish
         @options['--project'] || @options['-p'] || parsed_options_file['project']
       end
       
-      def host
-        @options['--host'] || DEFAULT_HOST
+      def url
+        "http://#{@options['--host'] || DEFAULT_HOST}/api"
+      end
+      
+      def resource
+        RestClient::Resource.new(url)
       end
       
       def api_token
         parsed_options_file['api_token']
       end
       
+      def get_param
+        args.shift if args.size.odd?
+      end
+      
       def get_options
         parsed_options_file.merge(Hash[*args])
       end

data/lib/relish/commands/config.rb

@@ -3,6 +3,15 @@ module Relish
     class Config < Base
       
       def default
+        show
+      end
+      
+      def show
+        puts(if File.exists?(LOCAL_OPTIONS_FILE)
+          IO.read(LOCAL_OPTIONS_FILE)
+        else
+          "No #{LOCAL_OPTIONS_FILE} file exists"
+        end)
       end
       
     end

data/lib/relish/commands/help.rb

@@ -0,0 +1,32 @@
+require 'yaml'
+
+module Relish
+  module Command
+    class Help < Base
+      class << self
+        def for_command(command, help)
+          command_help[command] = help
+        end
+        
+        def command_help
+          @command_help ||= {}
+        end
+      end
+      
+      def default
+        puts "This is the prefunctory help message for the relish gem."
+
+        puts "Commands:"
+        Help.command_help.each do |command, help|
+          message = "relish #{command}".ljust(max_command_length) + 
+                    " # " + help
+          puts message
+        end
+      end
+      
+      def max_command_length
+        Help.command_help.keys.map { |c| c.to_s.length }.max
+      end
+    end
+  end
+end

data/lib/relish/commands/projects.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'json'
+
+module Relish
+  module Command
+    class Projects < Base
+      
+      def default
+        list
+      end
+      
+      def list
+        response = resource['projects'].get(
+          :params => {:api_token => api_token}, :accept => :json
+        )
+        puts format(response)
+      rescue RestClient::Exception => exception
+        warn exception.response
+        exit 1
+      end
+      
+      def format(response)
+        json = JSON.parse(response)
+        json.map {|h| h['project']['slug']}.join("\n")
+      end
+            
+    end
+  end
+end

data/lib/relish/commands/push.rb

@@ -3,9 +3,12 @@ require 'zlib'
 require 'archive/tar/minitar'
 require 'stringio'
 require 'rest_client'
+require 'relish/commands/help'
 
 module Relish
   module Command
+    Help.for_command(:push, "push your features to relishapp.com")
+    
     class Push < Base
       
       def default
@@ -17,17 +20,16 @@ module Relish
       end
           
       def post(tar_gz_data)
-        resource = RestClient::Resource.new(url)
-        resource.post(tar_gz_data, :content_type => 'application/x-gzip')
+        resource[parameters].post(tar_gz_data, :content_type => 'application/x-gzip')
         puts "sent:\n#{files.join("\n")}"
       rescue RestClient::Exception => exception
         warn exception.response
         exit 1
       end
       
-      def url
+      def parameters
         "".tap do |str|
-          str << "http://#{host}/pushes?"
+          str << "pushes?"
           str << "creator_id=#{organization}&" if organization
           str << "project_id=#{project}&"
           str << "version_id=#{version}&" if version
@@ -58,5 +60,8 @@ module Relish
       end
       
     end
+    
+
   end
-end
+end
+

data/relish.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "relish"
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = '>= 1.3.5'
   s.authors = ["Matt Wynne", "Justin Ko"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   {
     'archive-tar-minitar' => '~> 0.5.2',
     'rest-client'         => '~> 1.6.1',
+    'json'                => '~> 1.4.6'
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end

data/spec/relish/command_spec.rb

@@ -9,4 +9,18 @@ describe Relish::Command do
     Relish::Command.run('push', [])
   end
   
+  it "recognizes the 'config' command" do
+    config = double
+    config.should_receive(:default)
+    Relish::Command::Config.should_receive(:new).with([]).and_return(config)
+    Relish::Command.run('config', [])
+  end
+  
+  it "recognizes the 'projects' command" do
+    projects = double
+    projects.should_receive(:default)
+    Relish::Command::Projects.should_receive(:new).with([]).and_return(projects)
+    Relish::Command.run('projects', [])
+  end
+  
 end

data/spec/relish/commands/base_spec.rb

@@ -24,7 +24,7 @@ module Relish
           end
           
           context 'contained in the options file' do
-            let(:base) { described_class.new([]) }
+            let(:base) { described_class.new }
             
             before do
               base.stub(:parsed_options_file).and_return({meth.to_s => name})
@@ -36,7 +36,7 @@ module Relish
           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
@@ -47,26 +47,34 @@ module Relish
         end
       end
       
-      describe '#host' do
-        context 'passed in command line' do
+      describe '#url' do
+        context 'host passed in command line' do
           let(:base) { described_class.new(['--host', 'test.com']) }
-          
-          it 'returns test.com' do
-            base.host.should eq('test.com')
-          end
+          specify { base.url.should eq('http://test.com/api') }
         end
         
-        context 'not passed in command line' do
-          let(:base) { described_class.new([]) }
+        context 'host not passed in command line' do
+          let(:base) { described_class.new }
           
           it 'returns the default host' do
-            base.host.should eq(Base::DEFAULT_HOST)
+            base.url.should eq("http://#{Base::DEFAULT_HOST}/api")
           end
         end
       end
       
+      describe '#resource' do
+        let(:base) { described_class.new }
+        
+        before do
+          base.should_receive(:url).and_return('url')
+          RestClient::Resource.should_receive(:new).with('url')
+        end
+        
+        specify { base.resource }
+      end
+      
       describe '#api_token' do
-        let(:base) { described_class.new([]) }
+        let(:base) { described_class.new }
         let(:options) { {'api_token' => '12345'} }
         
         before do
@@ -78,14 +86,41 @@ module Relish
         end
       end
       
+      describe '#get_param' do
+        
+        context 'given a command param' do
+          let(:base) do
+            base = described_class.new
+            base.args = ['param', '--project', 'rspec-core']
+            base
+          end
+          
+          it 'returns the first arg' do
+            base.get_param.should eq('param')
+          end
+        end
+        
+        context 'not given a command param' do
+          let(:base) do
+            base = described_class.new
+            base.args = ['--project', 'rspec-core']
+            base
+          end
+          
+          it 'returns nil' do
+            base.get_param.should be_nil
+          end
+        end
+      end
+      
       describe '#get_options' do
-        let(:base) { described_class.new(['--project', 'rspec-core']) }
         let(:options) { {'project' => 'rspec-core'} }
+        let(:base) { described_class.new(['--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'}
@@ -94,7 +129,7 @@ module Relish
       end
       
       describe '#parsed_options_file' do
-        let(:base) { described_class.new([]) }
+        let(:base) { described_class.new }
         
         context 'with options file that exists' do
           let(:options) do

data/spec/relish/commands/config_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+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
+        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.show
+          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
+          end
+        end
+      end
+      
+    end
+  end
+end

data/spec/relish/commands/projects_spec.rb

@@ -0,0 +1,24 @@
+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
+      
+      # describe '#url' do
+      #   context 'given a name' do
+      #     let(:projects) { described_class.new(['rspec-core']) }
+          
+          
+      
+    end
+  end
+end

data/spec/relish/commands/push_spec.rb

@@ -5,7 +5,7 @@ module Relish
     describe Push do
       
       describe '#default' do
-        let(:push) { described_class.new([]) }
+        let(:push) { described_class.new }
         
         it 'calls #run' do
           push.should_receive(:run)
@@ -13,18 +13,18 @@ module Relish
         end
       end
       
-      describe '#url' do
+      describe '#parameters' do
         before do
           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?project_id=rspec&api_token=abc"
+            push.parameters.should eq(
+              "pushes?project_id=rspec&api_token=abc"
             )
           end
         end
@@ -33,8 +33,8 @@ module Relish
           let(:push) { described_class.new(['--version', 'one']) }
           
           specify do
-            push.url.should eq(
-              "http://relishapp.com/pushes?project_id=rspec&version_id=one&api_token=abc"
+            push.parameters.should eq(
+              "pushes?project_id=rspec&version_id=one&api_token=abc"
             )
           end
         end
@@ -47,19 +47,19 @@ module Relish
         end
         
         context 'with --version not in @options' do
-          let(:push) { described_class.new([]) }
+          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

@@ -8,6 +8,11 @@ RSpec.configure do |config|
   config.color_enabled = true
   
   config.before(:suite) do
-    Relish::Command::Base::GLOBAL_OPTIONS_FILE = '~/.relish'
+    
+    Relish::Command::Base.class_eval do
+      remove_const(:GLOBAL_OPTIONS_FILE)
+      const_set(:GLOBAL_OPTIONS_FILE, '~/.relish')
+    end
+    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matt Wynne
@@ -20,9 +20,25 @@ date: 2010-09-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,11 +50,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,11 +66,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,11 +82,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +98,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,11 +114,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -114,11 +130,11 @@ dependencies:
         - 2
         version: 0.2.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,11 +146,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,7 +162,7 @@ dependencies:
         - 1
         version: 0.9.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: Client gem for http://relishapp.com
 email: jko170@gmail.com
 executables: 
@@ -163,6 +179,7 @@ files:
 - Rakefile
 - bin/relish
 - cucumber.yml
+- features/projects.feature
 - features/push.feature
 - features/step_definitions/aruba.rb
 - features/step_definitions/fake_web_steps.rb
@@ -171,10 +188,14 @@ files:
 - lib/relish/command.rb
 - lib/relish/commands/base.rb
 - lib/relish/commands/config.rb
+- lib/relish/commands/help.rb
+- lib/relish/commands/projects.rb
 - lib/relish/commands/push.rb
 - relish.gemspec
 - spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
+- spec/relish/commands/config_spec.rb
+- spec/relish/commands/projects_spec.rb
 - spec/relish/commands/push_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -214,6 +235,7 @@ signing_key:
 specification_version: 3
 summary: Client gem for http://relishapp.com
 test_files: 
+- features/projects.feature
 - features/push.feature
 - features/step_definitions/aruba.rb
 - features/step_definitions/fake_web_steps.rb
@@ -221,5 +243,7 @@ test_files:
 - features/support/env.rb
 - spec/relish/command_spec.rb
 - spec/relish/commands/base_spec.rb
+- spec/relish/commands/config_spec.rb
+- spec/relish/commands/projects_spec.rb
 - spec/relish/commands/push_spec.rb
 - spec/spec_helper.rb