relish 0.0.5 → 0.0.6

data/features/support/env.rb

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

data/lib/relish/command.rb

@@ -1,3 +1,4 @@
+require 'relish'
 require 'relish/commands/base'
 require 'relish/commands/push'
 require 'relish/commands/config'

data/lib/relish/commands/base.rb

@@ -1,54 +1,72 @@
 require 'yaml'
+require 'relish/ui'
+require 'relish/options_file'
+require 'relish/commands/dsl'
 
 module Relish
   module Command
     class Base
-      DEFAULT_HOST = 'relishapp.com'
-      GLOBAL_OPTIONS_FILE = File.join(File.expand_path('~'), '.relish')
-      LOCAL_OPTIONS_FILE = '.relish'
-      
-      attr_accessor :args
+      extend Dsl
       
+      attr_writer :args
+      attr_reader :cli_options
+            
       def initialize(args = [])
-        @args = args
+        @args = clean_args(args)
         @param = get_param
-        @options = get_options
+        @cli_options = Hash[*@args]
       end
       
-      def organization
-        @options['--organization'] || @options['-o'] || parsed_options_file['organization']
+      def url
+        "http://#{host}/api"
       end
       
-      def project
-        @options['--project'] || @options['-p'] || parsed_options_file['project']
+      def get_param
+        @args.shift if @args.size.odd?
       end
+
+    private
       
-      def url
-        "http://#{@options['--host'] || DEFAULT_HOST}/api"
-      end
+      option :organization
+      option :project
+      option :api_token, :default => lambda { get_and_store_api_token }
+      option :host,      :default => lambda { Relish.default_host }
       
-      def resource
-        RestClient::Resource.new(url)
+      def get_and_store_api_token
+        api_token = get_api_token
+        global_options_file.store('api_token' => api_token)
+        api_token
       end
       
-      def api_token
-        parsed_options_file['api_token']
+      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 get_param
-        args.shift if args.size.odd?
+      def resource(options = {})
+        RestClient::Resource.new(url, options)
+      end
+
+      def clean_args(args)
+        cleaned = []
+        args.each do |arg|
+          cleaned << arg.sub('--', '')
+        end
+        cleaned
       end
       
-      def get_options
-        parsed_options_file.merge(Hash[*args])
+      def global_options_file
+        @global_options ||= OptionsFile.new(Relish.global_options_file)
+      end
+
+      def local_options_file
+        @local_options ||= OptionsFile.new(Relish.local_options_file)
       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
+      def ui
+        @ui ||= Ui.new
       end
       
     end

data/lib/relish/commands/config.rb

@@ -7,13 +7,19 @@ module Relish
       end
       
       def show
-        puts(if File.exists?(LOCAL_OPTIONS_FILE)
-          IO.read(LOCAL_OPTIONS_FILE)
+        puts(if File.exists?(Relish.local_options_file)
+          IO.read(Relish.local_options_file)
         else
-          "No #{LOCAL_OPTIONS_FILE} file exists"
+          "No #{Relish.local_options_file} file exists"
         end)
       end
       
+      def add
+        File.open(Relish.local_options_file, 'a') do |f|
+          f.write(YAML::dump(Hash[*@args]))
+        end
+      end
+      
     end
   end
 end

data/lib/relish/commands/dsl.rb

@@ -0,0 +1,17 @@
+module Relish
+  module Command
+    module Dsl
+      
+      def option(name, options = {})
+        default_proc = options[:default] || lambda {}
+        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)
+        end
+      end
+      
+    end
+  end
+end

data/lib/relish/commands/projects.rb

@@ -5,20 +5,33 @@ module Relish
   module Command
     class Projects < Base
       
-      def default
-        list
-      end
+      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 exception.http_code
+      end
+      
+      def add
+        puts resource['projects'].post(:api_token => api_token, :handle => @param)
+      rescue RestClient::Exception => exception
+        warn exception.response
+        exit 1
+      end
+      
+      def remove
+        puts resource["projects/#{@param}?api_token=#{api_token}"].delete
       rescue RestClient::Exception => exception
         warn exception.response
         exit 1
       end
       
+    private
       def format(response)
         json = JSON.parse(response)
         json.map do |hash| 

data/lib/relish/commands/push.rb

@@ -11,16 +11,17 @@ module Relish
     
     class Push < Base
       
-      def default
-        run
-      end
+      option :version
+      
+      def default; run end
       
       def run
         post files_as_tar_gz
       end
           
       def post(tar_gz_data)
-        resource[parameters].post(tar_gz_data, :content_type => 'application/x-gzip')
+        resource["pushes?#{parameters}"].post(tar_gz_data,
+          :content_type => 'application/x-gzip')
         puts "sent:\n#{files.join("\n")}"
       rescue RestClient::Exception => exception
         warn exception.response
@@ -29,7 +30,6 @@ module Relish
       
       def parameters
         "".tap do |str|
-          str << "pushes?"
           str << "creator_id=#{organization}&" if organization
           str << "project_id=#{project}&"
           str << "version_id=#{version}&" if version
@@ -37,10 +37,6 @@ module Relish
         end
       end
       
-      def version
-        @options['--version'] || @options['-v']
-      end
-      
       def files_as_tar_gz
         stream = StringIO.new
         begin

data/lib/relish/options_file.rb

@@ -0,0 +1,45 @@
+require 'relish/commands/base'
+require 'yaml'
+
+module Relish
+
+  # Represents a .relish file
+  class OptionsFile
+
+    def initialize(path)
+      @path = path
+    end
+    
+    # Store the given options into the file. Existing options with the same keys
+    # will be overwritten.
+    def store(options)
+      new_options = self.options.merge(options)
+      FileUtils.touch(@path)
+      File.open(@path, 'w') do |file|
+        YAML.dump(new_options, file)
+      end
+    end
+    
+    def [](key)
+      options[key]
+    end
+    
+    def == (other)
+      options == other
+    end
+    
+    # Stored options as a hash
+    def options
+      @options ||= current_options
+    end
+    
+  private
+  
+    def current_options
+      return {} unless File.exist?(@path)
+      YAML.load_file(@path)
+    end
+
+  end
+
+end

data/lib/relish/ui.rb

@@ -0,0 +1,60 @@
+module Relish
+  class Ui
+    def get_credentials
+      puts "Please enter your Relish credentials."
+
+      print "Email: "
+      user = ask
+
+      print "Password: "
+      password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+
+      [ user, password ]
+    end
+    
+  private
+  
+    def running_on_windows?
+      RUBY_PLATFORM =~ /mswin32|mingw32/
+    end
+    
+    def ask_for_password_on_windows
+      require "Win32API"
+      char = nil
+      password = ''
+
+      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+        break if char == 10 || char == 13 # received carriage return or newline
+        if char == 127 || char == 8 # backspace and delete
+          password.slice!(-1, 1)
+        else
+          # windows might throw a -1 at us so make sure to handle RangeError
+          (password << char.chr) rescue RangeError
+        end
+      end
+      puts
+      return password
+    end
+
+    def ask_for_password
+      echo_off
+      password = ask
+      puts
+      echo_on
+      return password
+    end
+    
+    def echo_off
+      system "stty -echo"
+    end
+
+    def echo_on
+      system "stty echo"
+    end
+    
+    def ask
+      gets.strip
+    end
+    
+  end
+end

data/lib/relish.rb

@@ -0,0 +1,19 @@
+module Relish
+  class << self
+    
+    def self.setting(name, value)
+      attr_writer name
+      class_eval %{
+        def #{name}                              # def global_options_file
+          @#{name.to_s} ||=                      #   @global_options_file ||= 
+            ENV['RELISH_#{name.to_s.upcase}'] || #   ENV['RELISH_GLOBAL_OPTIONS_FILE'] || 
+            '#{value}'                           #   '~/.relish'
+        end                                      # end
+      }
+    end
+    
+    setting :global_options_file, File.join(File.expand_path('~'), '.relish')
+    setting :local_options_file,  '.relish'
+    setting :default_host,        'relishapp.com'
+  end
+end

data/relish.gemspec

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

data/spec/relish/commands/base_spec.rb

@@ -6,7 +6,7 @@ module Relish
     
       {:organization => 'rspec', :project => 'rspec-core'}.each do |meth, name|
         describe "##{meth}" do
-          context 'passed in command line as full arg' do
+          context 'passed in command line' do
             let(:base) { described_class.new(["--#{meth}", name]) }
           
             it 'returns the value' do
@@ -14,20 +14,11 @@ module Relish
             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
+          context 'contained in the local options file' do
             let(:base) { described_class.new }
             
             before do
-              base.stub(:parsed_options_file).and_return({meth.to_s => name})
+              OptionsFile.stub(:new).with(Relish.local_options_file).and_return({meth.to_s => name})
             end
             
             it 'returns the value' do
@@ -57,33 +48,60 @@ module Relish
           let(:base) { described_class.new }
           
           it 'returns the default host' do
-            base.url.should eq("http://#{Base::DEFAULT_HOST}/api")
+            base.url.should eq("http://#{Relish.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(:options) { {'api_token' => '12345'} }
-        
+        let(:ui)   { double(Ui) }
+
         before do
-          base.should_receive(:parsed_options_file).and_return(options)
+          Ui.stub(:new).and_return(ui)
+          OptionsFile.stub(:new => options)
         end
         
-        it 'parses the api token' do
-          base.api_token.should eq('12345')
+        context "when the token is stored locally" do
+          let(:options) { {'api_token' => '12345'} }
+          
+          it 'parses the api token' do
+            base.api_token.should eq('12345')
+          end
+        end
+
+        context "when the token is not stored locally" do
+          let(:options)     { {} }
+          let(:api_token)   { 'abasfawer23123' }
+          let(:credentials) { ['testuser', 'testpassword'] }
+          
+          let(:global_options) do
+            double = double(OptionsFile, :[] => nil)
+            OptionsFile.stub(:new => double)
+            double
+          end
+          
+          def api_endpoint(name, credentials)
+            user, password = *credentials
+            endpoint = double
+
+            RestClient::Resource.stub(:new).
+              with(anything, :user => user, :password => password).
+              and_return name => endpoint
+    
+            endpoint
+          end
+          
+          it "asks the user for their credentials and send them to the server" do
+            ui.should_receive(:get_credentials).and_return(credentials)
+            api_endpoint('token', credentials).should_receive(:get).and_return(api_token)
+            global_options.should_receive(:store).with 'api_token' => api_token
+            
+            base.api_token
+          end
+          
         end
+        
       end
       
       describe '#get_param' do
@@ -113,54 +131,6 @@ module Relish
         end
       end
       
-      describe '#get_options' do
-        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'}
-          )
-        end
-      end
-      
-      describe '#parsed_options_file' do
-        let(:base) { described_class.new }
-        
-        context 'with options file that exists' do
-          let(:options) do
-            {'organization' => 'rspec', 'project' => 'rspec-core'}
-          end
-          
-          before do
-            File.should_receive(:exist?).twice.and_return(true)
-            YAML.should_receive(:load_file).twice.and_return(options)
-          end
-          
-          it 'parses the organization' do
-            base.parsed_options_file['organization'].should eq('rspec')
-          end
-          
-          it 'parses the project' do
-            base.parsed_options_file['project'].should eq('rspec-core')
-          end
-        end
-        
-        context 'with options file that does not exist' do
-          before do
-            File.stub(:exist?).and_return(false)
-          end
-          
-          it 'returns an empty hash' do
-            base.parsed_options_file.should eq({})
-          end
-        end
-      end
-      
     end
   end
 end

data/spec/relish/commands/projects_spec.rb

@@ -11,13 +11,7 @@ module Relish
           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

@@ -24,7 +24,7 @@ module Relish
           
           specify do
             push.parameters.should eq(
-              "pushes?project_id=rspec&api_token=abc"
+              "project_id=rspec&api_token=abc"
             )
           end
         end
@@ -34,7 +34,7 @@ module Relish
           
           specify do
             push.parameters.should eq(
-              "pushes?project_id=rspec&version_id=one&api_token=abc"
+              "project_id=rspec&version_id=one&api_token=abc"
             )
           end
         end

data/spec/relish/options_file_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+module Relish
+  describe OptionsFile do
+    let(:path) { Dir.tmpdir + '/.relish' }
+    let(:global_options) { described_class.new(path) }
+  
+    after { FileUtils.rm_rf(path) }
+  
+    describe '#[]' do
+    
+      context 'with options file that exists' do
+        let(:options) do
+          {'organization' => 'rspec', 'project' => 'rspec-core'}
+        end
+      
+        before do
+          File.open(path, 'w') { |f| YAML.dump(options, f) }
+        end
+      
+        it 'parses the organization' do
+          global_options['organization'].should eq('rspec')
+        end
+      
+        it 'parses the project' do
+          global_options['project'].should eq('rspec-core')
+        end
+      end
+    
+      context 'with options file that does not exist' do
+        before do
+          FileUtils.rm_rf(path)
+        end
+      
+        it 'returns an empty hash' do
+          global_options.should eq({})
+        end
+      end
+    end
+  
+    describe '#store' do
+      context 'with options file that exists' do
+      
+        let(:options) do
+          {'organization' => 'rspec', 'project' => 'rspec-core'}
+        end
+      
+        before do
+          File.open(path, 'w') { |f| YAML.dump(options, f) }
+          global_options.store('organization' => 'relish')
+        end
+      
+        it "over-writes existing values" do
+          OptionsFile.new(path).options['organization'].should == 'relish'
+        end
+      
+        it 'leaves existing options alone' do
+          OptionsFile.new(path).options['project'].should == 'rspec-core'
+        end 
+      
+      end
+    end
+  
+  end
+end

data/spec/relish_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Relish do
+  it "has a .global_options_file setting" do
+    Relish.global_options_file.should_not be_nil
+  end
+  
+  it "allows global_options_file to be overwritten" do
+    Relish.global_options_file = 'foo'
+    Relish.global_options_file.should == 'foo'
+  end
+end

data/spec/spec_helper.rb

@@ -6,13 +6,5 @@ require 'relish/command'
 
 RSpec.configure do |config|
   config.color_enabled = true
-  
-  config.before(:suite) do
-    
-    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: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matt Wynne
@@ -185,18 +185,24 @@ files:
 - features/step_definitions/fake_web_steps.rb
 - features/step_definitions/relish_steps.rb
 - features/support/env.rb
+- lib/relish.rb
 - lib/relish/command.rb
 - lib/relish/commands/base.rb
 - lib/relish/commands/config.rb
+- lib/relish/commands/dsl.rb
 - lib/relish/commands/help.rb
 - lib/relish/commands/projects.rb
 - lib/relish/commands/push.rb
+- lib/relish/options_file.rb
+- lib/relish/ui.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/relish/options_file_spec.rb
+- spec/relish_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://relishapp.com
@@ -246,4 +252,6 @@ test_files:
 - spec/relish/commands/config_spec.rb
 - spec/relish/commands/projects_spec.rb
 - spec/relish/commands/push_spec.rb
+- spec/relish/options_file_spec.rb
+- spec/relish_spec.rb
 - spec/spec_helper.rb