rainforest-cli 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36eb7257778cfda59e340fea593c2b9662390949
-  data.tar.gz: 0c9d06828b51075a1ccd95b2710200ad94e6e5ac
+  metadata.gz: aefdfe1a4a5ecf73e5b919dbbf6da1bb7d13f5c1
+  data.tar.gz: 88ee5992a58f3340535f3b1d21ed54f8fea53cc8
 SHA512:
-  metadata.gz: ccddbb99af989e0d96f9761c67ed2a2a2dc9d1731264890d78adb8adb16170c51da4b17ca168c3cb602e21a793feb324307b4adf4d7195d78f27c45773b00cf5
-  data.tar.gz: 417541f667b2485f05f1b9528822832b19ac083489bff2fd93d79d90ff5a7c80a4dca3282f902fe61a9da291e1efe129b9dfcba838d6d80a9be35b6ba33725cd
+  metadata.gz: 4787e5a59c11fe612a982f2aabb51e6ed5386e2fef18fb5771aad337d54334b7514dfe4ea82d5738c51fb39496e28e13a5f3d440ac0773298eba2082c724969f
+  data.tar.gz: 64c1ef609db5add1c02c19e04d241e73520123b15d5c3fc60c0388875e3994b670f934c6b78b52c5f3750edc829445477a8b71ed544a6a676d4b9dd9d6ebf1b7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Rainforest CLI Changelog
 
+## 1.10.0 - 19th September 2016
+- Add `--overwrite-variable` option to overwrite existing tabular variables if the
+desired variable name is already taken when uploading CSVs. (ebf4ab90c5db2589695eaf6c3d4c4206bad17e7b,
+@epaulet)
+
 ## 1.9.0 - 14th September 2016
 - Add `upload-csv` command for updating tabular variables without starting a new run.
 (069e943cd94cbb08e6f00347ab6c8327372897ce, @epaulet)

data/README.md

@@ -136,11 +136,16 @@ rainforest report --run-id <run-id> --junit-file rainforest.xml
 
 #### Updating Tabular Variables
 
-Upload a CSV file to update your tabular variables
+Upload a CSV to create a new tabular variables.
 ```bash
 rainforest csv-upload --import-variable-csv-file PATH/TO/CSV.csv --import-variable-name my_variable
 ```
 
+Upload a CSV to update an existing tabular variables.
+```bash
+rainforest csv-upload --import-variable-csv-file PATH/TO/CSV.csv --import-variable-name my_variable --overwrite-variable
+```
+
 ## Options
 
 ### General

data/lib/rainforest_cli/csv_importer.rb

@@ -9,6 +9,7 @@ module RainforestCli
     def initialize(options)
       @generator_name = options.import_name
       @file = options.import_file_name
+      @overwrite_variable = options.overwrite_variable
     end
 
     def row_data columns, values
@@ -27,9 +28,21 @@ module RainforestCli
       end
       raise 'Invalid schema in CSV. You must include headers in first row.' if !columns
 
-      print 'Creating custom step variable'
+      if @overwrite_variable
+        puts 'Checking for existing tabular variables.'
+        generators = http_client.get('/generators')
+        generator = generators.find { |g| g['name'] == @generator_name }
+
+        if generator
+          puts 'Existing tabular variable found. Deleting old data.'
+          response = http_client.delete("/generators/#{generator['id']}")
+          raise "Error deleting old tabular variable: #{response['error']}" if response['error']
+        end
+      end
+
+      print 'Creating new tabular variable'
       response = http_client.post '/generators', { name: @generator_name, description: @generator_name, columns: columns }
-      raise "Error creating custom step variable: #{response['error']}" if response['error']
+      raise "Error creating tabular variable: #{response['error']}" if response['error']
       puts "\t[OK]"
 
       @columns = response['columns']
@@ -39,7 +52,7 @@ module RainforestCli
       p = ProgressBar.create(title: 'Rows', total: rows.count, format: '%a %B %p%% %t')
 
       # Insert the data
-      Parallel.each(rows, in_threads: 16, finish: lambda { |_item, _i, _result| p.increment }) do |row|
+      Parallel.each(rows, in_threads: RainforestCli::THREADS, finish: lambda { |_item, _i, _result| p.increment }) do |row|
         response = http_client.post("/generators/#{@generator_id}/rows", {data: row_data(@columns, row)})
         raise response['error'] if response['error']
       end

data/lib/rainforest_cli/options.rb

@@ -7,7 +7,7 @@ module RainforestCli
     attr_reader :command, :token, :tags, :conflict, :browsers, :site_id, :environment_id,
                 :import_file_name, :import_name, :custom_url, :description, :folder,
                 :debug, :file_name, :test_folder, :embed_tests, :app_source_url, :crowd, :run_id,
-                :junit_file
+                :junit_file, :overwrite_variable
 
     TOKEN_NOT_REQUIRED = %w{new validate}.freeze
 
@@ -42,14 +42,18 @@ module RainforestCli
           @crowd = value
         end
 
-        opts.on('--import-variable-csv-file FILE', 'Import step variables; CSV data') do |value|
+        opts.on('--import-variable-csv-file FILE', 'Import tabular step variables; CSV data') do |value|
           @import_file_name = value
         end
 
-        opts.on('--import-variable-name NAME', 'Import step variables; Name of variable (note, will be replaced if exists)') do |value|
+        opts.on('--import-variable-name NAME', 'Import tabular step variables; Name of variable') do |value|
           @import_name = value
         end
 
+        opts.on('--overwrite-variable', 'Import tabular step variables: overwrite existing variable if desired variable name is taken') do
+          @overwrite_variable = true
+        end
+
         opts.on('--git-trigger', 'Only run if the last commit contains @rainforestapp') do |_value|
           @git_trigger = true
         end

data/lib/rainforest_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RainforestCli
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/spec/rainforest_cli/csv_importer_spec.rb

@@ -8,43 +8,104 @@ describe RainforestCli::CSVImporter do
   end
 
   describe '.import' do
-    let(:options) { instance_double('RainforestCli::Options', import_name: 'variables', import_file_name: csv_file) }
+    let(:options) { instance_double('RainforestCli::Options', import_name: 'variables', import_file_name: csv_file, overwrite_variable: overwrite_variable) }
     subject { described_class.new(options) }
     let(:columns) { %w(email pass) }
+    let(:generator_id) { 12345 }
+    let(:existing_generators) { [] }
 
     let(:success_response) do
       {
-        'id' => 12345,
+        'id' => generator_id,
         'columns' => columns.each_with_index.map { |col, i| { 'id' => i, 'name' => col } },
       }
     end
 
-    it 'should post the schema to the generators API' do
-      expect(http_client).to receive(:post)
-                              .with('/generators', {
-                                      name: 'variables',
-                                      description: 'variables',
-                                      columns: columns.map {|col| { name: col } },
-                                    })
-                              .and_return success_response
-
-      expect(http_client).to receive(:post)
-                              .with('/generators/12345/rows', {
-                                      data: {
-                                        0 => 'russ@rainforestqa.com',
-                                        1 => 'abc123',
-                                      },
-                                    }).and_return({})
-
-      expect(http_client).to receive(:post)
-                              .with('/generators/12345/rows', {
-                                      data: {
-                                        0 => 'bob@example.com',
-                                        1 => 'hunter2',
-                                      },
-                                    }).and_return({})
-
-      subject.import
+    before do
+      allow(http_client).to receive(:get).with('/generators').and_return(existing_generators)
+    end
+
+    shared_examples 'it properly uploads variables' do
+      it 'makes the proper API interactions' do
+        expect(http_client).to receive(:post)
+                                .with('/generators', {
+                                        name: 'variables',
+                                        description: 'variables',
+                                        columns: columns.map {|col| { name: col } },
+                                      })
+                                .and_return success_response
+
+        expect(http_client).to receive(:post)
+                                .with("/generators/#{generator_id}/rows", {
+                                        data: {
+                                          0 => 'russ@rainforestqa.com',
+                                          1 => 'abc123',
+                                        },
+                                      }).and_return({})
+
+        expect(http_client).to receive(:post)
+                                .with("/generators/#{generator_id}/rows", {
+                                        data: {
+                                          0 => 'bob@example.com',
+                                          1 => 'hunter2',
+                                        },
+                                      }).and_return({})
+        subject.import
+      end
+    end
+
+    context 'without variable overwriting' do
+      let(:overwrite_variable) { nil }
+
+      it_behaves_like 'it properly uploads variables'
+
+      context 'tabular variable with given name already exists' do
+        let(:existing_generators) do
+          [
+            {
+              'id' => 98765,
+              'name' => 'existing',
+            },
+            {
+              'id' => generator_id,
+              'name' => 'variables',
+            },
+          ]
+        end
+
+        before do
+          expect(http_client).to_not receive(:delete)
+        end
+
+        it_behaves_like 'it properly uploads variables'
+      end
+    end
+
+    context 'with variable overwriting' do
+      let(:overwrite_variable) { true }
+
+      it_behaves_like 'it properly uploads variables'
+
+      context 'tabular variable with given name already exists' do
+        let(:existing_generators) do
+          [
+            {
+              'id' => 98765,
+              'name' => 'existing',
+            },
+            {
+              'id' => generator_id,
+              'name' => 'variables',
+            },
+          ]
+        end
+
+        before do
+          expect(http_client).to receive(:delete).with("/generators/#{generator_id}").and_return({})
+        end
+
+        it_behaves_like 'it properly uploads variables'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Russell Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty