rainforest-cli 0.0.17 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f0506c347475feb787f15df4c3db6abd53bae7
-  data.tar.gz: 27985a231afb31f370324ecc8992b9d2cc9714ef
+  metadata.gz: ba717beff0c92befa7902d611e480080e717c607
+  data.tar.gz: 377bbc58b3ea971c1a028db37480245dfa808dc7
 SHA512:
-  metadata.gz: 50867b13b94b3d1b335a1997c81596d4083c4d12f1275599b1af56514b0677eeff65e11b830d2fe9e18d3397ad48c5393b51dd512e4b347059558666cd49c553
-  data.tar.gz: 29182d051069e39381c7388ae53b8952aa0ff93280430b59456a3e4d82e108058acba1bf88c4f7c180e895ebadfc08838a1170b34b54a774545d2fccb11499ab
+  metadata.gz: daa1731fd6dab4c06c3d6f5ed07a81f7104b299498476eda2b370913e86dac4ebaf4dabc799305dfd647af5a5792949154bef81e8692a68f5a640bb3e4715606
+  data.tar.gz: 3bd19eb1863e67789b83aa6bf7597c61cf0a7d01cf442a7cc149ffb3fdad84b819e10246a4f51b64587392f549fa6e3c12fc381040f0ca7bdfa26c013b514bf8

data/README.md

@@ -4,42 +4,67 @@
 
 A command line interface to interact with RainforestQA.
 
+This is the easiest way to integrate Rainforest with your deploy scripts or CI server. See [our documentation](http://support.rainforestqa.com/hc/en-us/sections/200597986-Continuous-Integration) on the subject.
+
 ## Installation
 
-    $ gem install rainforest-cli
+You can install rainforest-cli with the [gem](https://rubygems.org/) utility.
+
+```bash
+gem install rainforest-cli
+```
+
+Alternatively, you can add to your Gemfile if you're in a ruby project.
+
+```ruby
+gem "rainforest-cli", require: false
+```
 
 ## Basic Usage
 To use the cli client, you'll need your API token from a test settings page from inside [Rainforest](https://app.rainforestqa.com/).
 
 Run all of your tests
 
-    rainforest run all --token YOUR_TOKEN_HERE
+```bash
+rainforest run all --token YOUR_TOKEN_HERE
+```
 
 Run all in the foreground and report
 
-    rainforest run all --fg --token YOUR_TOKEN_HERE
+```bash
+rainforest run all --fg --token YOUR_TOKEN_HERE
+```
 
 Run all tests with tag 'run-me' and abort previous in-progress runs.
 
-    rainforest run --tag run-me --fg --conflict abort --token YOUR_TOKEN_HERE 
+```bash
+rainforest run --tag run-me --fg --conflict abort --token YOUR_TOKEN_HERE 
+```
 
 
 ## Options
 
+### General
+
 Required:
 - `--token <your-rainforest-token>` - you must supply your token (get it from any tests API tab)
 
+
+### Running Tests
 The options are:
 
 - `--browsers ie8` or `--browsers ie8,chrome` - specficy the browsers you wish to run against. This overrides the test own settings. Valid browsers are ie8, ie9, chrome, firefox and safari.
 - `--tag run-me` - only run tests which have this tag (recommended if you have lots of [test-steps](http://docs.rainforestqa.com/pages/example-test-suite.html#test_steps))!)
-- `--conflict abort` - if you trigger rainforest more than once, anything running will be aborted and a fresh run started
-- `--fail-fast` - fail the build as soon as the first failed result comes in. If you don't pass this it will wait until 100% of the run is done
-- `--fg` - results in the foreground - this is what you want to make the build pass / fail dependent on rainforest results 
 - `--site-id` - only run tests for a specific site. Get in touch with us for help on getting that you site id if you are unable to.
-- `--custom-url` - use a custom url for this run. Example use case: an ad-hoc QA environment with [Fourchette](https://github.com/rainforestapp/fourchette). You will need to specify a `site_id` too for this to work. Please note that we will be creating environments under the hood and will not affect your test permanently.
+- `--conflict abort` - if you trigger rainforest more than once, anything running will be aborted and a fresh run started
+- `--fg` - results in the foreground - rainforest-cli will not return until the run is complete. This is what you want to make the build pass / fail dependent on rainforest results 
+- `--fail-fast` - fail the build as soon as the first failed result comes in. If you don't pass this it will wait until 100% of the run is done. Use with `--fg`.
+- `--custom-url` - use a custom url for this run. Example use case: an ad-hoc QA environment with [Fourchette](https://github.com/rainforestapp/fourchette). You will need to specify a `site_id` too for this to work. Note that we will be creating a new environment for this particular run.
 - `--git-trigger` - only trigger a run when the last commit (for a git repo in the current working directory) has contains `@rainforest` and a list of one or more tags. E.g. "Fix checkout process. @rainforest #checkout" would trigger a run for everything tagged `checkout`. This over-rides `--tag` and any tests specified. If no `@rainforest` is detected it will exit 0.
 
+## Support
+
+Email [help@rainforestqa.com](mailto:help@rainforestqa.com) if you're having trouble using this gem or need help to integrate Rainforest in your CI or deployment flow.
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+end
+

data/lib/rainforest/cli.rb

@@ -1,5 +1,7 @@
 require "rainforest/cli/version"
 require "rainforest/cli/options"
+require "rainforest/cli/runner"
+require "rainforest/cli/http_client"
 require "rainforest/cli/git_trigger"
 require "rainforest/cli/csv_importer"
 require "httparty"
@@ -8,176 +10,29 @@ require "logger"
 
 module Rainforest
   module Cli
-    API_URL = 'https://app.rainforestqa.com/api/1'.freeze
-
     def self.start(args)
-      @options = OptionParser.new(args)
+      options = OptionParser.new(args)
       OptionParser.new(['--help']) if args.size == 0
 
-      unless @options.token
-        logger.fatal "You must pass your API token using: --token TOKEN"
-        exit 2
-      end
-
-      if @options.custom_url && @options.site_id.nil?
-        logger.fatal "The site-id and custom-url options are both required."
-        exit 2
-      end
-
-      if @options.import_file_name && @options.import_name
-        unless File.exists?(@options.import_file_name)
-          logger.fatal "Input file: #{@options.import_file_name} not found"
-          exit 2
-        end
-
-        delete_generator(@options.import_name)
-        CSVImporter.new(@options.import_name, @options.import_file_name, @options.token).import
-      elsif @options.import_file_name || @options.import_name
-        logger.fatal "You must pass both --import-variable-csv-file and --import-variable-name"
-        exit 2
-      end
-
-      post_opts = {}
-
-      if @options.git_trigger?
-        logger.debug "Checking last git commit message:"
-        commit_message = GitTrigger.last_commit_message
-        logger.debug commit_message
-
-        # Show some messages to users about tests/tags being overriden
-        unless @options.tags.empty?
-          logger.warn "Specified tags are ignored when using --git-trigger"
-        else
-          logger.warn "Specified tests are ignored when using --git-trigger"
-        end
-
-        if GitTrigger.git_trigger_should_run?(commit_message)
-          tags = GitTrigger.extract_hashtags(commit_message)
-          if tags.empty?
-            logger.error "Triggered via git, but no hashtags detected. Please use commit message format:"
-            logger.error "\t'some message. @rainforest #tag1 #tag2"
-            exit 2
-          else
-            post_opts[:tags] = [tags.join(',')]
-          end
-        else
-          logger.info "Not triggering as @rainforest was not mentioned in last commit message."
-          exit 0
-        end
-      else
-        # Not using git_trigger, so look for the
-        if !@options.tags.empty?
-          post_opts[:tags] = @options.tags
-        else
-          post_opts[:tests] = @options.tests
-        end
-      end
-
-      post_opts[:conflict] = @options.conflict if @options.conflict
-      post_opts[:browsers] = @options.browsers if @options.browsers
-      post_opts[:site_id] = @options.site_id if @options.site_id
-      post_opts[:gem_version] = Rainforest::Cli::VERSION
-
-      post_opts[:environment_id] = get_environment_id(@options.custom_url) if @options.custom_url
-
-      logger.debug "POST options: #{post_opts.inspect}"
-      logger.info "Issuing run"
-
-      response = post(API_URL + '/runs', post_opts)
-
-      if response['error']
-        logger.fatal "Error starting your run: #{response['error']}"
-        exit 1
-      end
-
-      run_id = response["id"]
-      running = true
-
-      return unless @options.foreground?
-
-      while running
-        Kernel.sleep 5
-        response = get "#{API_URL}/runs/#{run_id}?gem_version=#{Rainforest::Cli::VERSION}"
-        if response
-          if %w(queued validating in_progress sending_webhook waiting_for_callback).include?(response["state"])
-            logger.info "Run #{run_id} is #{response['state']} and is #{response['current_progress']['percent']}% complete"
-            running = false if response["result"] == 'failed' && @options.failfast?
-          else
-            logger.info "Run #{run_id} is now #{response["state"]} and has #{response["result"]}"
-            running = false
-          end
-        end
-      end
-
-      if response["result"] != "passed"
-        exit 1
-      end
-      true
-    end
-
-    def self.list_generators
-      get("#{API_URL}/generators")
-    end
-
-    def self.delete_generator(name)
-      generator = list_generators.find {|g| g['generator_type'] == 'tabular' && g['name'] == name }
-      delete("#{API_URL}/generators/#{generator['id']}") if generator
-    end
-
-    def self.delete(url, body = {})
-      response = HTTParty.delete url, {
-        body: body,
-        headers: {"CLIENT_TOKEN" => @options.token}
-      }
-
-      JSON.parse(response.body)
-    end
-
-    def self.post(url, body = {})
-      response = HTTParty.post url, {
-        body: body,
-        headers: {"CLIENT_TOKEN" => @options.token}
-      }
-
-      JSON.parse(response.body)
-    end
-
-    def self.get(url, body = {})
-      response = HTTParty.get url, {
-        body: body,
-        headers: {"CLIENT_TOKEN" => @options.token}
-      }
-
-      if response.code == 200
-        JSON.parse(response.body)
-      else
-        nil
-      end
-    end
-
-    def self.get_environment_id url
       begin
-        URI.parse(url)
-      rescue URI::InvalidURIError
-        logger.fatal "The custom URL is invalid"
+        options.validate!
+      rescue OptionParser::ValidationError => e
+        logger.fatal e.message
         exit 2
       end
 
-      env_post_body = { name: 'temporary-env-for-custom-url-via-CLI', url: url }
-      environment = post("#{API_URL}/environments", env_post_body)
-
-      if environment['error']
-        # I am talking about a URL here because the environments are pretty
-        # much hidden from clients so far.
-        logger.fatal "Error creating the ad-hoc URL: #{environment['error']}"
-        exit 1
-      end
+      runner = Runner.new(options)
+      runner.run
 
-      return environment['id']
+      true
     end
 
     def self.logger
       @logger ||= Logger.new(STDOUT)
     end
+
+    def self.logger=(logger)
+      @logger = logger
+    end
   end
 end

data/lib/rainforest/cli/git_trigger.rb

@@ -16,4 +16,4 @@ module Rainforest
       end
     end
   end
-end
+end

data/lib/rainforest/cli/http_client.rb

@@ -0,0 +1,56 @@
+module Rainforest
+  module Cli
+    class HttpClient
+      API_URL = ENV.fetch("RAINFOREST_API_URL") do
+        'https://app.rainforestqa.com/api/1'
+      end.freeze
+
+      def initialize(options)
+        @token = options.fetch(:token)
+      end
+
+      def delete(url, body = {})
+        response = HTTParty.delete make_url(url), {
+          body: body,
+          headers: headers,
+        }
+
+        JSON.parse(response.body)
+      end
+
+      def post(url, body = {})
+        response = HTTParty.post make_url(url), {
+          body: body,
+          headers: headers,
+        }
+
+        JSON.parse(response.body)
+      end
+
+      def get(url, body = {})
+        response = HTTParty.get make_url(url), {
+          body: body,
+          headers: headers,
+        }
+
+        if response.code == 200
+          JSON.parse(response.body)
+        else
+          nil
+        end
+      end
+
+      private
+      def make_url(url)
+        File.join(API_URL, url)
+      end
+
+      def headers
+        {
+          "CLIENT_TOKEN" => @token,
+          "User-Agent" => "Rainforest-cli-#{Rainforest::Cli::VERSION}"
+        }
+      end
+    end
+  end
+end

data/lib/rainforest/cli/options.rb

@@ -66,7 +66,7 @@ module Rainforest
           opts.on("--custom-url URL", String, "Use a custom url for this run. You will need to specify a site_id too for this to work.") do |value|
             @custom_url = value
           end
-          
+
           opts.on_tail("--help", "Display help message and exit") do |value|
             puts opts
             exit 0
@@ -92,6 +92,29 @@ module Rainforest
       def foreground?
         @foreground
       end
+
+      def validate!
+        unless token
+          raise ValidationError, "You must pass your API token using: --token TOKEN"
+        end
+
+        if custom_url && site_id.nil?
+          raise ValidationError, "The site-id and custom-url options are both required."
+        end
+
+        if import_file_name && import_name
+          unless File.exists?(import_file_name)
+            raise ValidationError, "Input file: #{import_file_name} not found"
+          end
+
+        elsif import_file_name || import_name
+          raise ValidationError, "You must pass both --import-variable-csv-file and --import-variable-name"
+        end
+        true
+      end
+
+      class ValidationError < RuntimeError
+      end
     end
   end
 end

data/lib/rainforest/cli/runner.rb

@@ -0,0 +1,151 @@
+module Rainforest
+  module Cli
+    class Runner
+      attr_reader :options, :client
+
+      def initialize(options)
+        @options = options
+        @client = HttpClient.new token: options.token
+      end
+
+      def run
+        if options.import_file_name && options.import_name
+          delete_generator(options.import_name)
+          CSVImporter.new(options.import_name, options.import_file_name, options.token).import
+        end
+
+        post_opts = make_create_run_options
+
+        logger.debug "POST options: #{post_opts.inspect}"
+        logger.info "Issuing run"
+
+        response = client.post('/runs', post_opts)
+
+        if response['error']
+          logger.fatal "Error starting your run: #{response['error']}"
+          exit 1
+        end
+
+
+        if options.foreground?
+          run_id = response.fetch("id")
+          wait_for_run_completion(run_id)
+        else
+          true
+        end
+      end
+
+      def wait_for_run_completion(run_id)
+        running = true
+        while running
+          Kernel.sleep 5
+          response = client.get("/runs/#{run_id}")
+          if response
+            state_details = response.fetch('state_details')
+            unless state_details.fetch("is_final_state")
+              logger.info "Run #{run_id} is #{response['state']} and is #{response['current_progress']['percent']}% complete"
+              running = false if response["result"] == 'failed' && options.failfast?
+            else
+              logger.info "Run #{run_id} is now #{response["state"]} and has #{response["result"]}"
+              running = false
+            end
+          end
+        end
+
+        if url = response["frontend_url"]
+          logger.info "The detailed results are available at #{url}"
+        end
+
+        if response["result"] != "passed"
+          exit 1
+        end
+      end
+
+      def make_create_run_options
+        post_opts = {}
+        if options.git_trigger?
+          logger.debug "Checking last git commit message:"
+          commit_message = GitTrigger.last_commit_message
+          logger.debug commit_message
+
+          # Show some messages to users about tests/tags being overriden
+          unless options.tags.empty?
+            logger.warn "Specified tags are ignored when using --git-trigger"
+          else
+            logger.warn "Specified tests are ignored when using --git-trigger"
+          end
+
+          if GitTrigger.git_trigger_should_run?(commit_message)
+            tags = GitTrigger.extract_hashtags(commit_message)
+            if tags.empty?
+              logger.error "Triggered via git, but no hashtags detected. Please use commit message format:"
+              logger.error "\t'some message. @rainforest #tag1 #tag2"
+              exit 2
+            else
+              post_opts[:tags] = [tags.join(',')]
+            end
+          else
+            logger.info "Not triggering as @rainforest was not mentioned in last commit message."
+            exit 0
+          end
+        else
+          # Not using git_trigger, so look for the
+          if !options.tags.empty?
+            post_opts[:tags] = options.tags
+          else
+            post_opts[:tests] = options.tests
+          end
+        end
+
+        post_opts[:conflict] = options.conflict if options.conflict
+        post_opts[:browsers] = options.browsers if options.browsers
+        post_opts[:site_id] = options.site_id if options.site_id
+
+        if options.custom_url
+          post_opts[:environment_id] = get_environment_id(options.custom_url)
+        end
+
+        post_opts
+      end
+
+      def logger
+        Rainforest::Cli.logger
+      end
+
+      def list_generators
+        client.get("/generators")
+      end
+
+      def delete_generator(name)
+        generator = list_generators.find {|g| g['generator_type'] == 'tabular' && g['name'] == name }
+        client.delete("generators/#{generator['id']}") if generator
+      end
+
+      def url_valid?(url)
+        return false unless URI::regexp === url
+
+        uri = URI.parse(url)
+        %w(http https).include?(uri.scheme)
+      end
+
+      def get_environment_id url
+        unless url_valid?(url)
+          logger.fatal "The custom URL is invalid"
+          exit 2
+        end
+
+        env_post_body = { name: 'temporary-env-for-custom-url-via-CLI', url: url }
+        environment = client.post("/environments", env_post_body)
+
+        if environment['error']
+          # I am talking about a URL here because the environments are pretty
+          # much hidden from clients so far.
+          logger.fatal "Error creating the ad-hoc URL: #{environment['error']}"
+          exit 1
+        end
+
+        return environment['id']
+      end
+    end
+  end
+end

data/lib/rainforest/cli/version.rb

@@ -1,5 +1,5 @@
 module Rainforest
   module Cli
-    VERSION = "0.0.17"
+    VERSION = "1.0.0"
   end
 end

data/spec/cli_spec.rb

@@ -1,52 +1,38 @@
 describe Rainforest::Cli do
+  let(:http_client) { Rainforest::Cli::HttpClient.any_instance }
+
   before do
     Kernel.stub(:sleep)
-    stub_const("Rainforest::Cli::API_URL", 'http://app.rainforest.dev/api/1')
   end
 
   describe ".start" do
     let(:valid_args) { %w(--token foo run --fg all) }
-    let(:ok_progress) { {"state" => "in_progress", "current_progress" => {"percent" => "1"} } }
+    let(:ok_progress) do
+      {
+        "state" => "in_progress",
+        "current_progress" => {"percent" => "1"},
+        "state_details" => { "is_final_state" => false },
+        "result" => "no_result",
+      }
+    end
+
+    let(:complete_response) do
+      {
+        "state" => "complete",
+        "current_progress" => {"percent" => "100"},
+        "state_details" => { "is_final_state" => true},
+        "result" => "passed",
+      }
+    end
 
     context "with bad parameters" do
       context "no token" do
         let(:params) { %w(--custom-url http://ad-hoc.example.com) }
         it 'errors out' do
           expect_any_instance_of(Logger).to receive(:fatal).with('You must pass your API token using: --token TOKEN')
-          begin
-            described_class.start(params)
-          rescue SystemExit => e
-            # That's fine, this is expected but tested in a differnet assertion
-          end
-        end
-
-        it 'exits with exit code 2' do
-          expect {
-            described_class.start(params)
-          }.to raise_error { |error|
-            expect(error).to be_a(SystemExit)
-            expect(error.status).to eq 2
-          }
-        end
-      end
-
-      context "with custom-url with no site-id" do
-        let(:params) { %w(--token x --custom-url http://ad-hoc.example.com) }
-
-        it 'errors out' do
-          expect_any_instance_of(Logger).to receive(:fatal).with('The site-id and custom-url options are both required.')
-          begin
-            described_class.start(params)
-          rescue SystemExit => e
-            # That's fine, this is expected but tested in a differnet assertion
-          end
-        end
-
-        it 'exits with exit code 2' do
           expect {
             described_class.start(params)
-          }.to raise_error { |error|
-            expect(error).to be_a(SystemExit)
+          }.to raise_error(SystemExit) { |error|
             expect(error.status).to eq 2
           }
         end
@@ -68,23 +54,23 @@ describe Rainforest::Cli do
       before do
         Rainforest::Cli::GitTrigger.stub(:last_commit_message) { commit_message }
       end
-      
+
       describe "with tags parameter passed" do
         let(:params) { %w(--token x --tag x --git-trigger) }
 
         it "warns about the parameter being ignored" do
           expect_any_instance_of(Logger).to receive(:warn).with("Specified tags are ignored when using --git-trigger")
-          
+
           start_with_params(params, 0)
         end
       end
-      
+
       describe "with tags parameter passed" do
         let(:params) { %w(all --token x --git-trigger) }
 
         it "warns about the parameter being ignored" do
           expect_any_instance_of(Logger).to receive(:warn).with("Specified tests are ignored when using --git-trigger")
-          
+
           start_with_params(params, 0)
         end
       end
@@ -102,7 +88,7 @@ describe Rainforest::Cli do
         it "exit 2's and logs the reason" do
           expect_any_instance_of(Logger).to receive(:error).with("Triggered via git, but no hashtags detected. Please use commit message format:")
           expect_any_instance_of(Logger).to receive(:error).with("\t'some message. @rainforest #tag1 #tag2")
-          
+
           start_with_params(params, 2)
         end
       end
@@ -111,10 +97,11 @@ describe Rainforest::Cli do
         let(:commit_message) { 'a test commit message @rainforest #run-me' }
 
         it "starts the run with the specified tags" do
-          expect(described_class).to receive(:post).with(
-            "http://app.rainforest.dev/api/1/runs",
-            { :tags=>['run-me'], :gem_version=>Rainforest::Cli::VERSION }
-          ).and_return( {} )
+          http_client.should_receive(:post) do |url, options|
+            expect(url).to eq("/runs")
+            expect(options[:tags]).to eq(['run-me'])
+            {}
+          end
 
           start_with_params(params, 0)
         end
@@ -124,9 +111,7 @@ describe Rainforest::Cli do
     context "with site-id and custom-url" do
       let(:params) { %w(--token x --site 3 --custom-url http://ad-hoc.example.com) }
       it "creates a new environment" do
-        allow(described_class).to receive(:post).and_return { exit }
-        expect(described_class).to receive(:post).with(
-            "http://app.rainforest.dev/api/1/environments",
+        http_client.should_receive(:post).with("/environments",
             {
               :name => "temporary-env-for-custom-url-via-CLI",
               :url=>"http://ad-hoc.example.com"
@@ -135,6 +120,8 @@ describe Rainforest::Cli do
             { 'id' => 333 }
           )
 
+        http_client.should_receive(:post).with("/runs", anything).and_return( { "id" => 1 } )
+
         # This is a hack because when expecting a function to be called with
         # parameters, the last call is compared but I want to compare the first
         # call, not the call to create a run, so I exit, but rescue from it here
@@ -147,11 +134,11 @@ describe Rainforest::Cli do
       end
 
       it "starts the run with site_id and environment_id" do
-        allow(described_class).to receive(:get_environment_id).and_return(333)
+        Rainforest::Cli::Runner.any_instance.stub(get_environment_id: 333)
 
-        expect(described_class).to receive(:post).with(
-          "http://app.rainforest.dev/api/1/runs",
-          { :tests=>[], :site_id=>3, :gem_version=>Rainforest::Cli::VERSION, :environment_id=>333 }
+        http_client.should_receive(:post).with(
+          "/runs",
+          { :tests=>[], :site_id=>3, :environment_id=>333 }
         ).and_return( {} )
         described_class.start(params)
       end
@@ -159,11 +146,11 @@ describe Rainforest::Cli do
 
     context "a simple run" do
       before do
-        described_class.stub(:post) { {"id" => 1} }
-        3.times do 
-          described_class.should_receive(:get) { ok_progress }
+        http_client.stub(:post) { {"id" => 1} }
+        3.times do
+          http_client.should_receive(:get) { ok_progress }
         end
-        described_class.should_receive(:get) { {"state" => "complete", "result" => "passed" } }
+        http_client.should_receive(:get) { complete_response }
       end
 
       it "should return true" do
@@ -173,18 +160,18 @@ describe Rainforest::Cli do
 
     context "a run where the server 500s after a while" do
       before do
-        described_class.stub(:post) { {"id" => 1} }
-        2.times do 
-          described_class.should_receive(:get) { ok_progress }
+        http_client.stub(:post) { {"id" => 1} }
+        2.times do
+          http_client.should_receive(:get) { ok_progress }
         end
 
-        described_class.should_receive(:get) { nil }
+        http_client.should_receive(:get) { nil }
 
-        2.times do 
-          described_class.should_receive(:get) { ok_progress }
+        2.times do
+          http_client.should_receive(:get) { ok_progress }
         end
 
-        described_class.should_receive(:get) { {"state" => "complete", "result" => "passed" } }
+        http_client.should_receive(:get) { complete_response }
       end
 
       it "should return true" do
@@ -192,34 +179,4 @@ describe Rainforest::Cli do
       end
     end
   end
-
-  describe ".get_environment_id" do
-    context "with an invalid URL" do
-      xit 'errors out and exits' do
-        expect_any_instance_of(Logger).to receive(:fatal).with("The custom URL is invalid")
-        expect {
-          described_class.get_environment_id('http://some=weird')
-        }.to raise_error { |error|
-          expect(error).to be_a(SystemExit)
-          expect(error.status).to eq 2
-        }
-      end
-    end
-
-    context 'on API error' do
-      before do
-        allow(described_class).to receive(:post).and_return( {"error"=>"Some API error"} )
-      end
-
-      it 'errors out and exits' do
-        expect_any_instance_of(Logger).to receive(:fatal).with("Error creating the ad-hoc URL: Some API error")
-        expect {
-          described_class.get_environment_id('http://example.com')
-        }.to raise_error { |error|
-          expect(error).to be_a(SystemExit)
-          expect(error.status).to eq 1
-        }
-      end
-    end
-  end
 end

data/spec/git_trigger_spec.rb

@@ -1,13 +1,25 @@
 describe Rainforest::Cli::GitTrigger do
   subject { described_class }
 
+  let(:default_dir) { __dir__ }
+  let(:test_repo_dir) { File.join(Dir.tmpdir, 'raiforest-cli', 'test-repo') }
+
   describe ".last_commit_message" do
-    xit "returns a string" do
+    around(:each) do |spec|
       default_dir = Dir.pwd
+      FileUtils.mkdir_p test_repo_dir
+      Dir.chdir(test_repo_dir)
+      setup_test_repo
+      begin
+        spec.call
+      ensure
+        Dir.chdir(default_dir)
+      end
+    end
 
-      Dir.chdir(File.join([default_dir, 'spec', 'test-repo']))
+    # Commented because it kills CI
+    xit "returns a string" do
       expect(described_class.last_commit_message).to eq "Initial commit"
-      Dir.chdir(default_dir)
     end
   end
 
@@ -26,4 +38,14 @@ describe Rainforest::Cli::GitTrigger do
       expect(described_class.extract_hashtags('#dashes-work, #underscores_work #007')).to eq ['dashes-work', 'underscores_work', '007']
     end
   end
+
+  def setup_test_repo
+    FileUtils.rm_rf File.join(test_repo_dir, "*")
+    [
+      "git init",
+      "git commit --allow-empty -m 'Initial commit'",
+    ].each do |cmd|
+        system cmd
+      end
+  end
 end

data/spec/options_spec.rb

@@ -1,80 +1,128 @@
 describe Rainforest::Cli::OptionParser do
   subject { Rainforest::Cli::OptionParser.new(args) }
 
-  context "importing csv file" do
-    let(:args) { ["--import-variable-csv-file", "some_file.csv"] }
-    its(:import_file_name) { should == "some_file.csv" }
-  end
+  describe "#initialize" do
+    context "importing csv file" do
+      let(:args) { ["--import-variable-csv-file", "some_file.csv"] }
+      its(:import_file_name) { should == "some_file.csv" }
+    end
 
-  context "importing name" do
-    let(:args) { ["--import-variable-name", "some_name"] }
-    its(:import_name) { should == "some_name" }
-  end
+    context "importing name" do
+      let(:args) { ["--import-variable-name", "some_name"] }
+      its(:import_name) { should == "some_name" }
+    end
 
-  context "run all tests" do
-    let(:args) { ["run", "all"] }
-    its(:tests) { should == ["all"]}
-    its(:conflict) { should == nil}
-  end
+    context "run all tests" do
+      let(:args) { ["run", "all"] }
+      its(:tests) { should == ["all"]}
+      its(:conflict) { should == nil}
+    end
 
-  context "run from tags" do
-    let(:args) { ["run", "--tag", "run-me"] }
-    its(:tests) { should == []}
-    its(:tags) { should == ["run-me"]}
-  end
+    context "run from tags" do
+      let(:args) { ["run", "--tag", "run-me"] }
+      its(:tests) { should == []}
+      its(:tags) { should == ["run-me"]}
+    end
 
-  context "only run in specific browsers" do
-    let(:args) { ["run", "--browsers", "ie8"] }
-    its(:browsers) { should == ["ie8"]}
-  end
+    context "only run in specific browsers" do
+      let(:args) { ["run", "--browsers", "ie8"] }
+      its(:browsers) { should == ["ie8"]}
+    end
 
-  context "raises errors with invalid browsers" do
-    let(:args) { ["run", "--browsers", "lulbrower"] }
+    context "raises errors with invalid browsers" do
+      let(:args) { ["run", "--browsers", "lulbrower"] }
 
-    it "raises an exception" do
-      expect{subject}.to raise_error(Rainforest::Cli::BrowserException)
+      it "raises an exception" do
+        expect{subject}.to raise_error(Rainforest::Cli::BrowserException)
+      end
     end
-  end
 
-  context "accepts multiple browsers" do
-    let(:args) { ["run", "--browsers", "ie8,chrome"] }
-    its(:browsers) { should == ["ie8", "chrome"]}
-  end
+    context "accepts multiple browsers" do
+      let(:args) { ["run", "--browsers", "ie8,chrome"] }
+      its(:browsers) { should == ["ie8", "chrome"]}
+    end
 
-  context "it parses the --git-trigger flag" do
-    let(:args) { ["run", "--git-trigger", "all"] }
-    its(:tests) { should == ["all"]}
-    its(:git_trigger?) { should be_true }
-  end
+    context "it parses the --git-trigger flag" do
+      let(:args) { ["run", "--git-trigger", "all"] }
+      its(:tests) { should == ["all"]}
+      its(:git_trigger?) { should be_true }
+    end
 
-  context "it parses the --fg flag" do
-    let(:args) { ["run", "--fg", "all"] }
-    its(:tests) { should == ["all"]}
-    its(:foreground?) { should be_true }
-  end
+    context "it parses the --fg flag" do
+      let(:args) { ["run", "--fg", "all"] }
+      its(:tests) { should == ["all"]}
+      its(:foreground?) { should be_true }
+    end
 
-  context "it parses the api token" do
-    let(:args) { ["run", "--token", "abc",  "all"] }
-    its(:token) { should == "abc"}
-  end
+    context "it parses the api token" do
+      let(:args) { ["run", "--token", "abc",  "all"] }
+      its(:token) { should == "abc"}
+    end
 
-  context "it parses the conflict flag" do
-    let(:args) { ["run", "--conflict", "abort",  "all"] }
-    its(:conflict) { should == "abort"}
-  end
+    context "it parses the conflict flag" do
+      let(:args) { ["run", "--conflict", "abort",  "all"] }
+      its(:conflict) { should == "abort"}
+    end
 
-  context "it parses the fail-fast flag" do
-    let(:args) { ["run", "--fail-fast"] }
-    its(:failfast?) { should be_true }
-  end
+    context "it parses the fail-fast flag" do
+      let(:args) { ["run", "--fail-fast"] }
+      its(:failfast?) { should be_true }
+    end
+
+    context "it parses the site-id flag" do
+      let(:args) { ["run", "--site-id", '3'] }
+      its(:site_id) { should eq 3 }
+    end
 
-  context "it parses the site-id flag" do
-    let(:args) { ["run", "--site-id", '3'] }
-    its(:site_id) { should eq 3 }
+    context "it parses the custom-url flag" do
+      let(:args) { ["run", "--custom-url", 'http://ad-hoc.example.com'] }
+      its(:custom_url) { should eq 'http://ad-hoc.example.com' }
+    end
   end
 
-  context "it parses the custom-url flag" do
-    let(:args) { ["run", "--custom-url", 'http://ad-hoc.example.com'] }
-    its(:custom_url) { should eq 'http://ad-hoc.example.com' }
+  describe "#validate!" do
+    def does_not_raise_a_validation_exception
+      expect do
+        subject.validate!
+      end.to_not raise_error
+    end
+
+    def raises_a_validation_exception
+      expect do
+        subject.validate!
+      end.to raise_error(described_class::ValidationError)
+    end
+
+    context "with valid arguments" do
+      let(:args) { %w(--token foo) }
+      it { does_not_raise_a_validation_exception }
+    end
+
+    context "with missing token" do
+      let(:args) { %w() }
+      it { raises_a_validation_exception }
+    end
+
+    context "with a custom url but no site id" do
+      let(:args) { %w(--token foo --custom-url http://www.example.com) }
+      it { raises_a_validation_exception }
+    end
+
+    context "with a import_file_name but no import name" do
+      let(:args) { %w(--token foo --import-variable-csv-file foo.csv) }
+      it { raises_a_validation_exception }
+    end
+
+    context "with a import_file_name and a import_name" do
+      context "for an existing file" do
+        let(:args) { %W(--token foo --import-variable-csv-file #{__FILE__} --import-variable-name my-var) }
+        it { does_not_raise_a_validation_exception }
+      end
+
+      context "for a non existing file" do
+        let(:args) { %W(--token foo --import-variable-csv-file does_not_exist --import-variable-name my-var) }
+        it { raises_a_validation_exception }
+      end
+    end
   end
 end

data/spec/runner_spec.rb

@@ -0,0 +1,59 @@
+describe Rainforest::Cli::Runner do
+  let(:args) { %w(run all) }
+  let(:options) { Rainforest::Cli::OptionParser.new(args) }
+  subject { described_class.new(options) }
+
+  describe "#get_environment_id" do
+    context "with an invalid URL" do
+      it 'errors out and exits' do
+        expect {
+          subject.get_environment_id('some=weird')
+        }.to raise_error(SystemExit) { |error|
+          expect(error.status).to eq 2
+        }
+      end
+    end
+
+    context 'on API error' do
+      before do
+        allow(subject.client).to receive(:post).and_return( {"error"=>"Some API error"} )
+      end
+
+      it 'errors out and exits' do
+        expect_any_instance_of(Logger).to receive(:fatal).with("Error creating the ad-hoc URL: Some API error")
+        expect {
+          subject.get_environment_id('http://example.com')
+        }.to raise_error(SystemExit) { |error|
+          expect(error.status).to eq 1
+        }
+      end
+    end
+  end
+
+  describe "#url_valid?" do
+    subject { super().url_valid?(url) }
+    [
+      "http://example.org",
+      "https://example.org",
+      "http://example.org/",
+      "http://example.org?foo=bar",
+    ].each do |valid_url|
+      context "#{valid_url}" do
+        let(:url) { valid_url }
+        it { should be(true) }
+      end
+    end
+
+    [
+      "ftp://example.org",
+      "example.org",
+      "",
+    ].each do |valid_url|
+      context "#{valid_url}" do
+        let(:url) { valid_url }
+        it { should be(false) }
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@
 
 require "rainforest/cli"
 
+Rainforest::Cli.logger = Logger.new(StringIO.new)
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors:
 - Simon Mathieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -105,12 +105,15 @@ files:
 - lib/rainforest/cli.rb
 - lib/rainforest/cli/csv_importer.rb
 - lib/rainforest/cli/git_trigger.rb
+- lib/rainforest/cli/http_client.rb
 - lib/rainforest/cli/options.rb
+- lib/rainforest/cli/runner.rb
 - lib/rainforest/cli/version.rb
 - rainforest-cli.gemspec
 - spec/cli_spec.rb
 - spec/git_trigger_spec.rb
 - spec/options_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 homepage: https://www.rainforestqa.com/
 licenses:
@@ -140,4 +143,5 @@ test_files:
 - spec/cli_spec.rb
 - spec/git_trigger_spec.rb
 - spec/options_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb