rainforest-cli 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72def45d00f529b7b7c35d23b097dbe3e0e0ea89
-  data.tar.gz: 0a6312c46e0862e24272881e6adb6fc22c477423
+  metadata.gz: 0f42f5204c7270c3eac865f11542df5a4018a95a
+  data.tar.gz: 4d3e1c7e16bbb265f6d1fb0f9f3602b8f48dc8e5
 SHA512:
-  metadata.gz: 1a1c28ebb3bce9b4ef7788b75c098055f7b83f588d1797a547d44c65d7490cef80ccb43179873f8fbcbd9d5dac095bc567d40904c3dd596f0d2cb011d9623579
-  data.tar.gz: 4a37fbeb379b70c1f7b8b284ff5f61c56fc02c7a26a35f8b893bdb53879ed48a2ce0fd3954670db3cab7a8f0b24aca467c48fbe34b56e991191b384ba9fbf8b4
+  metadata.gz: 39cac3328e88e9d2cc174c0386f135ff11d7cd52b012b0daea620733a3aab1e0f7f0ee02623c156e1a2eb8e69c55422426f2c3a2364aff7c84f447b9e583abc7
+  data.tar.gz: 9cd678e820f6dc9385a2db12b4d5d29ea58dbb50c590a48a055f4723bb734dc5ff9ab2b89046420b408f2aca2cb4196d3b93d19e5190067a6fd694fe55a76d6e

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.0.0
   - 1.9.3
-  - ruby-head
 
 script: bundle exec rspec spec

data/README.md

@@ -36,6 +36,8 @@ The options are:
 - `--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.
 
 
 ## Contributing

data/certs/ukd1.pem

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMR0wGwYDVQQDDBRydXNz
+ZWxsLmhvd2FyZC5zbWl0aDESMBAGCgmSJomT8ixkARkWAm1lMRMwEQYKCZImiZPy
+LGQBGRYDY29tMB4XDTE0MDgxNDA1Mzc0NloXDTE1MDgxNDA1Mzc0NlowSDEdMBsG
+A1UEAwwUcnVzc2VsbC5ob3dhcmQuc21pdGgxEjAQBgoJkiaJk/IsZAEZFgJtZTET
+MBEGCgmSJomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKSK3Sfhs+miX1jdDywi9Khl1QjIn2DUM1U+bou6WLkQaOUtqhX/T2jHltQ9
+Olc7jaz4XO5g+YngELX2tGFA6zbUnvaHXnPz23hPsP5TUErFAI1VJYl9fmQY6sEd
+komCT8jZwB09Re20iyZtNsEMa8gagR7qX1wgPVqxAncE7OJ5stwHxcSQABfGrInF
+sdZyjqNE2D0NxWZoWTC7CERaRNUm12y4NpHm6fdvtbgsB14WQjaqOYYUmFffT89Y
+c0TOOGUV1aMbjpRUZFhu/tAaWGW+GfZnln9F3GWYJMRzC5k8+awB1vXgnfqZH007
+ef85jyOutXfKKYyXcWlvrDMoTTUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIEsDAdBgNVHQ4EFgQUFws4YIAtrBiQdbpWgqwcYd/+Hh4wJgYDVR0RBB8w
+HYEbcnVzc2VsbC5ob3dhcmQuc21pdGhAbWUuY29tMCYGA1UdEgQfMB2BG3J1c3Nl
+bGwuaG93YXJkLnNtaXRoQG1lLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEADHQJiURU
+PJbfReV/MgIum917Vktz9Zv1GPzKzY5EkIL34FylaSernkITWe6GcsMb8yNrdG/1
+eSyAvx32v/L3ef2mp7kHXbtzcXBq3xyCewfH6AfX3dm65CfgaeGx+qK/F/bl0iiZ
+SQpNWk3RB/7deQThk3SYD8jS8n1d7KSRLogpXnSNWRyaSHtZ2x7T2qVpn4lp1PIi
+/4Hg5bJrO0VqDlVG8UvsFbFB24ZNDQVq73MLZFNez0UBhOZVo4kBlSUvyEv5YLlA
+wWdLLpBZZ1O4GE0uzQovmTiis4iyCF+8tFIgjbM/FVwKUBV6OZpxs4FOBtR1mK6L
+lj0cPcKRm/FZUw==
+-----END CERTIFICATE-----

data/lib/rainforest/cli/options.rb

@@ -10,7 +10,8 @@ module Rainforest
     end
 
     class OptionParser
-      attr_reader :command, :token, :tags, :conflict, :browsers, :import_file_name, :import_name
+      attr_reader :command, :token, :tags, :conflict, :browsers, :site_id,
+                  :import_file_name, :import_name, :custom_url
 
       VALID_BROWSERS = %w{chrome firefox safari ie8 ie9}.freeze
 
@@ -53,6 +54,14 @@ module Rainforest
           opts.on("--conflict MODE", String, "How should Rainforest handle existing in progress runs?") do |value|
             @conflict = value
           end
+
+          opts.on("--site-id ID", Integer, "Only run tests for a specific site") do |value|
+            @site_id = value
+          end
+
+          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
         end.parse!(@args)
 
         @command = @args.shift

data/lib/rainforest/cli/version.rb

@@ -1,5 +1,5 @@
 module Rainforest
   module Cli
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/lib/rainforest/cli.rb

@@ -10,13 +10,18 @@ module Rainforest
     
     def self.start(args)
       @options = OptionParser.new(args)
-      
+
+      if @options.custom_url && @options.site_id.nil?
+        puts "The site-id and custom-url options work together, you need both of them."
+        exit 1
+      end
+
       if @options.import_file_name && @options.import_name
         unless File.exists?(@options.import_file_name)
           puts "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
@@ -33,8 +38,11 @@ module Rainforest
 
       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
+
       puts "Issuing run"
 
       response = post(API_URL + '/runs', post_opts)
@@ -68,11 +76,11 @@ module Rainforest
       end
       true
     end
-    
+
     def self.list_generators
       get("#{API_URL}/generators")
     end
-    
+
     def self.delete_generator(name)
       generator = list_generators.find {|g| g['type'] == 'custom' && g['key'] == name }
       delete("#{API_URL}/generators/#{generator['id']}") if generator
@@ -83,7 +91,7 @@ module Rainforest
         body: body, 
         headers: {"CLIENT_TOKEN" => @options.token}
       }
-      
+
       JSON.parse(response.body)
     end
 
@@ -108,5 +116,26 @@ module Rainforest
         nil
       end
     end
+
+    def self.get_environment_id url
+      begin
+        URI.parse(url)
+      rescue URI::InvalidURIError
+        puts "The custom URL is invalid"
+        exit 1
+      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.
+        puts "Error creating the ad-hoc URL: #{environment['error']}"
+        exit 1
+      end
+
+      return environment['id']
+    end
   end
 end

data/spec/cli_spec.rb

@@ -1,12 +1,70 @@
 describe Rainforest::Cli do
   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"} } }
 
+    context "with bad parameters" do
+      context "with custom-url with no site-id" do
+        it 'errors out' do
+          expect(STDOUT).to receive(:puts).with('The site-id and custom-url options work together, you need both of them.')
+          begin
+            described_class.start(%w(--custom-url http://ad-hoc.example.com))
+          rescue SystemExit => e
+            # That's fine, this is expected but tested in a differnet assertion
+          end
+        end
+
+        it 'exits with exit code 1' do
+          expect {
+            described_class.start(%w(--custom-url http://ad-hoc.example.com))
+          }.to raise_error { |error|
+            expect(error).to be_a(SystemExit)
+            expect(error.status).to eq 1
+          }
+        end
+      end
+    end
+
+    context "with site-id and custom-url" do
+      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",
+            {
+              :name => "temporary-env-for-custom-url-via-CLI",
+              :url=>"http://ad-hoc.example.com"
+            }
+          ).and_return(
+            { 'id' => 333 }
+          )
+
+        # 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
+        # so that the spec doesn't fail. It's horrible, sorry!
+        begin
+          described_class.start(%w(--site 3 --custom-url http://ad-hoc.example.com))
+        rescue SystemExit => e
+          # That's fine, this is expected but tested in a differnet assertion
+        end
+      end
+
+      it "starts the run with site_id and environment_id" do
+        allow(described_class).to receive(:get_environment_id).and_return(333)
+
+        expect(described_class).to receive(:post).with(
+          "http://app.rainforest.dev/api/1/runs",
+          { :tests=>[], :site_id=>3, :gem_version=>"0.0.13", :environment_id=>333 }
+        ).and_return( {} )
+        described_class.start(%w(--site 3 --custom-url http://ad-hoc.example.com))
+      end
+    end
+
     context "a simple run" do
       before do
         described_class.stub(:post) { {"id" => 1} }
@@ -42,4 +100,34 @@ describe Rainforest::Cli do
       end
     end
   end
+
+  describe ".get_environment_id" do
+    context "with an invalid URL" do
+      it 'errors out and exits' do
+        expect(STDOUT).to receive(:puts).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 1
+        }
+      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(STDOUT).to receive(:puts).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/options_spec.rb

@@ -61,4 +61,14 @@ describe Rainforest::Cli::OptionParser 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 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

data.tar.gz.sig

@@ -1 +1,2 @@
-�?��̛��Ɛe��Q���H���}�I�&O�Hf��A��b�z��V�:�[�����X�߬v���bu�����֬��gR�~��-"дja�0H6`5ާz$�8őP��p�+V[�xq��#)� ��E�
J})$�up#��	�!��iս}�XA*���	���N���l��hwͥ$k��r��i�u(��R������ŗ{y�A�J�L�'���
+Z��K�i�
+�P3�W�wl������Yj����ߌR�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Simon Mathieu
@@ -32,7 +32,7 @@ cert_chain:
   wWdLLpBZZ1O4GE0uzQovmTiis4iyCF+8tFIgjbM/FVwKUBV6OZpxs4FOBtR1mK6L
   lj0cPcKRm/FZUw==
   -----END CERTIFICATE-----
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -123,6 +123,7 @@ files:
 - README.md
 - Rakefile
 - bin/rainforest
+- certs/ukd1.pem
 - lib/rainforest/cli.rb
 - lib/rainforest/cli/csv_importer.rb
 - lib/rainforest/cli/options.rb