relish 0.0.6 → 0.0.7

data/lib/relish/commands/base.rb

@@ -8,6 +8,10 @@ module Relish
     class Base
       extend Dsl
       
+      option :project
+      option :api_token, :default => lambda { get_and_store_api_token }
+      option :host,      :default => lambda { Relish.default_host }, :display => false
+      
       attr_writer :args
       attr_reader :cli_options
             
@@ -15,6 +19,8 @@ module Relish
         @args = clean_args(args)
         @param = get_param
         @cli_options = Hash[*@args]
+
+        validate_cli_options
       end
       
       def url
@@ -26,12 +32,7 @@ module Relish
       end
 
     private
-      
-      option :organization
-      option :project
-      option :api_token, :default => lambda { get_and_store_api_token }
-      option :host,      :default => lambda { Relish.default_host }
-      
+
       def get_and_store_api_token
         api_token = get_api_token
         global_options_file.store('api_token' => api_token)
@@ -48,13 +49,28 @@ module Relish
       def resource(options = {})
         RestClient::Resource.new(url, options)
       end
-
+      
       def clean_args(args)
-        cleaned = []
-        args.each do |arg|
-          cleaned << arg.sub('--', '')
+        args.inject([]) {|cleaned, arg| cleaned << arg.sub('--', '') }
+      end
+      
+      def valid_option_names
+        self.class.option_names
+      end
+      
+      def option_names_to_display
+        self.class.option_names_to_display
+      end
+      
+      def validate_cli_options
+        @cli_options.keys.each do |option|
+          unless valid_option_names.include?(option.to_s)
+            puts "#{option} is not a valid option.\n" +
+                 "Valid options are: #{option_names_to_display.sort.join(', ')}"
+                  
+            exit 1
+          end
         end
-        cleaned
       end
       
       def global_options_file

data/lib/relish/commands/config.rb

@@ -15,9 +15,7 @@ module Relish
       end
       
       def add
-        File.open(Relish.local_options_file, 'a') do |f|
-          f.write(YAML::dump(Hash[*@args]))
-        end
+        OptionsFile.new(Relish.local_options_file).store(@cli_options)
       end
       
     end

data/lib/relish/commands/dsl.rb

@@ -3,13 +3,26 @@ module Relish
     module Dsl
       
       def option(name, options = {})
-        default_proc = options[:default] || lambda {}
+        name = name.to_s
+        default_proc = options[:default] || Proc.new {}
+        
         define_method(name) do
-          cli_options[name.to_s] ||
-            local_options_file[name.to_s] ||
-            global_options_file[name.to_s] ||
-            instance_exec(&default_proc)
+          cli_options[name] ||
+          local_options_file[name] ||
+          global_options_file[name] ||
+          instance_exec(&default_proc)
         end
+        
+        option_names << name
+        option_names_to_display << name unless options[:display] == false
+      end
+      
+      def option_names
+        @@option_names ||= []
+      end
+      
+      def option_names_to_display
+        @@option_names_to_display ||= []
       end
       
     end

data/lib/relish/commands/projects.rb

@@ -35,7 +35,7 @@ module Relish
       def format(response)
         json = JSON.parse(response)
         json.map do |hash| 
-          result = hash['project']['handle']
+          result = hash['project']['full_handle']
           result << " (private)" if hash['project']['private']
           result
         end.join("\n")

data/lib/relish/commands/push.rb

@@ -30,7 +30,6 @@ module Relish
       
       def parameters
         "".tap do |str|
-          str << "creator_id=#{organization}&" if organization
           str << "project_id=#{project}&"
           str << "version_id=#{version}&" if version
           str << "api_token=#{api_token}"

data/relish.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "relish"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = '>= 1.3.5'
   s.authors = ["Matt Wynne", "Justin Ko"]

data/spec/relish/commands/base_spec.rb

@@ -4,35 +4,35 @@ module Relish
   module Command
     describe Base do
     
-      {: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]) }
+      describe "#project" do
+        context 'passed in command line' do
+          let(:base) { described_class.new(["--project", 'rspec-core']) }
+        
+          it 'returns the value' do
+            base.project.should eq('rspec-core')
+          end
+        end
+        
+        context 'contained in the local options file' do
+          let(:base) { described_class.new }
           
-            it 'returns the value' do
-              base.send(meth).should eq(name)
-            end
+          before do
+            OptionsFile.stub(:new).with(
+              Relish.local_options_file
+            ).and_return({'project' => 'rspec-core'})
           end
           
-          context 'contained in the local options file' do
-            let(:base) { described_class.new }
-            
-            before do
-              OptionsFile.stub(:new).with(Relish.local_options_file).and_return({meth.to_s => name})
-            end
-            
-            it 'returns the value' do
-              base.send(meth).should eq(name)
-            end
+          it 'returns the value' do
+            base.project.should eq('rspec-core')
           end
+        end
+      
+        context 'not passed in command line' do
+          let(:base) { described_class.new }
         
-          context 'not passed in command line' do
-            let(:base) { described_class.new }
-          
-            context 'and options file does not exist' do
-              it 'returns nil' do
-                base.send(meth).should be_nil
-              end
+          context 'and options file does not exist' do
+            it 'returns nil' do
+              base.project.should be_nil
             end
           end
         end

data/spec/relish/commands/push_spec.rb

@@ -41,12 +41,12 @@ module Relish
       end
       
       describe '#version' do
-        context 'with --version in @options' do
+        context 'with --version passed in command line' do
           let(:push) { described_class.new(['--version', 'one']) }
           specify { push.version.should eq('one') }
         end
         
-        context 'with --version not in @options' do
+        context 'with --version not passed in command line' do
           let(:push) { described_class.new }
           specify { push.version.should be_nil }
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relish
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matt Wynne
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +01:00
+date: 2010-09-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency