rainforest-cli 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270928ed835e7dbed583470fff3b9c1986e5fe9a
-  data.tar.gz: fc60894506391ac1e329b5fb9961fddd920da227
+  metadata.gz: 64c92d088ca6ebcc0b9b64ec565c28755a5c3179
+  data.tar.gz: ce73f06786865a973aa5db835458d88b4bd4edc5
 SHA512:
-  metadata.gz: 3e395a458362b9d1d2c55d3622655d0fc0f9576a713023f0c1b809c786eaa6bff3a9a606057b032d21db08d92017db542b621a59951d7bdea88ee21dd77afd80
-  data.tar.gz: a719238a0aa11bf602c1ff21ee56799380363d1145ce59f8fa38f1f2e18f8099a7defc02bf462a9745c2a2341c5774813bee4bfbf28c2becebedfeb1d2f73725
+  metadata.gz: 86ee464ee5745117353fb673682355aed50361b31b76a01b97dce5f4e34817e2439f5bd0a7467f511f80956b93e2ef32c87e349d4dbd24970a804c0b82e09da1
+  data.tar.gz: f91efb44badfae00246e3a9d2d991242af873eed47c800330fd9c8a1f94d131a9d22f76ac6fe0c3119e6308bfed73ecd297a611ac17027d37501c18bc3651bcb

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Rainforest CLI Changelog
 
-## 1.1.3 - 15th January 2016
+## 1.1.4 - 15th January 2016
 - Customizable folder location for rainforest tests (fa4418738311cee8ca25cbb22a8ca52aa9cbd873, @ukd1)
 - Update valid browser list, though this doesn't include custom browsers today (e6195c42f95cce72a17f49643bfe8c297baf8dd9, @ukd1)
 

data/lib/rainforest/cli/options.rb

@@ -12,7 +12,7 @@ module RainforestCli
     attr_writer :file_name, :tags
     attr_reader :command, :token, :tags, :conflict, :browsers, :site_id, :environment_id,
                 :import_file_name, :import_name, :custom_url, :description, :folder,
-                :debug, :file_name
+                :debug, :file_name, :test_spec_folder
 
     # Note, not all of these may be available to your account
     # also, we may remove this in the future.
@@ -24,6 +24,7 @@ module RainforestCli
       @browsers = nil
       @require_token = true
       @debug = false
+      @test_spec_folder = RainforestCli::TestImporter::SPEC_FOLDER
 
       @parsed = ::OptionParser.new do |opts|
         opts.on("--debug") do
@@ -34,6 +35,10 @@ module RainforestCli
           @file_name = value
         end
 
+        opts.on("--test-folder spec/rainforest", "Specify the test folder. Defaults to spec/rainforest if not set.") do |value|
+          @test_spec_folder = value
+        end
+
         opts.on("--import-variable-csv-file FILE", "Import step variables; CSV data") do |value|
           @import_file_name = value
         end

data/lib/rainforest/cli/test_importer.rb

@@ -25,8 +25,8 @@ EOF
 
   def initialize(options)
     @options = options
-    unless File.exists?(SPEC_FOLDER)
-      logger.fatal "Rainforest folder not found (#{SPEC_FOLDER})"
+    unless File.exists?(@options.test_spec_folder)
+      logger.fatal "Rainforest test folder not found (#{@options.test_spec_folder})"
       exit 2
     end
   end
@@ -185,7 +185,7 @@ EOF
     tests = {}
     has_errors = []
 
-    Dir.glob("#{SPEC_FOLDER}/**/*#{EXT}").each do |file_name|
+    Dir.glob("#{@options.test_spec_folder}/**/*#{EXT}").each do |file_name|
       out = RainforestCli::TestParser::Parser.new(File.read(file_name)).process
 
       tests[file_name] = out
@@ -228,7 +228,7 @@ EOF
     uuid = SecureRandom.uuid
     name = "#{uuid}#{EXT}" unless name
     name += EXT unless name[-EXT.length..-1] == EXT
-    name = File.join([SPEC_FOLDER, name])
+    name = File.join([@options.test_spec_folder, name])
 
     File.open(name, "w") { |file| file.write(sprintf(SAMPLE_FILE, uuid)) }
 

data/lib/rainforest/cli/version.rb

@@ -1,3 +1,3 @@
 module RainforestCli
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/options_spec.rb

@@ -7,6 +7,16 @@ describe RainforestCli::OptionParser do
       its(:import_file_name) { should == "some_file.csv" }
     end
 
+    context "test folder (when passed)" do
+      let(:args) { ["--test-folder", "/path/to/folder"] }
+      its(:test_spec_folder) { should == "/path/to/folder" }
+    end
+
+    context "test folder (when not passed)" do
+      let(:args) { [] }
+      its(:test_spec_folder) { should == RainforestCli::TestImporter::SPEC_FOLDER }
+    end
+
     context "importing name" do
       let(:args) { ["--import-variable-name", "some_name"] }
       its(:import_name) { should == "some_name" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Simon Mathieu