rainforest-cli 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d643c76641c2871f0f18ea635ffe868546443721
-  data.tar.gz: 073a323ecb28931576a27d1a7f352718920a3e83
+  metadata.gz: 846b92985179bad132fce666ba44a2cf700acb10
+  data.tar.gz: 1565a3189a175799df17c4146cec815939f7bb13
 SHA512:
-  metadata.gz: 6b612e2ff7c36f3a666aa6ce0e15740c6051a6af936a3f117ccef0b87d056e6e1c242c5cae54571b880f0bbc7b573b7cfeb117f1691f2dbb984a26dd8f333d5a
-  data.tar.gz: 74af9041c9d0b69815a33588b819cfaf44ed323cff190224fd68bf94ad57fbd101f7d709ce8c887bfdf288da8ac287fc74a7806a1567c38f2086609e91e8d281
+  metadata.gz: 327eb266af0cc546b77aba045e965258bdf5ed022152d2713349c66eb18a3727e1ed6c8b47d3f710139d0fac6e2c0ca1f54141c6d53bc0f56550a65b3e57d4f1
+  data.tar.gz: d3a6f4f8806d4ef16ae925083fd81887ede699d51d34ff30841a4af42479369dfba173d89df10adab14f21a2b5260c9fbff2936bbd83f837ad99a48aeb8220e6

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 # Rainforest CLI Changelog
 
+## 1.12.1 - 7th February 2017
+- Check columns returned from API before uploading rows when creating generators.
+(458fdf5bf3ba28588dfb48d1253192ba477ac7ae, @epaulet)
+
 ## 1.12.0 - 6th February 2017
 - Add category column to list of sites when using the `sites` command.
+(11c24c3484a587b7305dcf279872fa5e5be02b5a, @epaulet)
 
 ## 1.11.0 - 4th November 2016
 - Add `--single-use` flag for CSV uploads. (17a19694a788365beb59e634bd7286c86528484b, @epaulet)

data/lib/rainforest_cli/csv_importer.rb

@@ -24,10 +24,10 @@ module RainforestCli
       end
 
       # Create the generator
-      columns = rows.shift.map do |column|
-        column.downcase.strip.gsub(/\s/, '_')
+      column_names = rows.shift.map do |col_name|
+        col_name.downcase.strip.gsub(/\s/, '_')
       end
-      raise 'Invalid schema in CSV. You must include headers in first row.' if !columns
+      raise 'Invalid schema in CSV. You must include headers in first row.' if !column_names
 
       if @overwrite_variable
         puts 'Checking for existing tabular variables.'
@@ -44,13 +44,13 @@ module RainforestCli
       puts 'Creating new tabular variable'
       response = http_client.post(
         '/generators',
-        { name: @generator_name, description: @generator_name, columns: columns, single_use: @single_use },
+        { name: @generator_name, description: @generator_name, columns: column_names, single_use: @single_use },
         { retries_on_failures: true }
       )
       raise "Error creating tabular variable: #{response['error']}" if response['error']
       puts "\t[OK]"
 
-      columns = response['columns']
+      columns = sort_columns(column_names, response['columns'])
       generator_id = response['id']
       data = rows.map { |row| row_data(columns, row) }
 
@@ -71,6 +71,12 @@ module RainforestCli
       puts 'Upload complete.'
     end
 
+    def sort_columns(ordered_column_names, columns)
+      ordered_column_names.map do |col_name|
+        columns.find { |col| col['name'] == col_name }
+      end
+    end
+
     private
 
     def http_client

data/lib/rainforest_cli/version.rb

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

data/spec/rainforest_cli/csv_importer_spec.rb

@@ -69,6 +69,14 @@ describe RainforestCli::CSVImporter do
 
     it_behaves_like 'it properly uploads variables'
 
+    context 'the API returns the columns in a variable order' do
+      before do
+        success_response['columns'] = success_response['columns'].reverse
+      end
+
+      it_behaves_like 'it properly uploads variables'
+    end
+
     context 'tabular variable with given name already exists' do
       let(:existing_generators) do
         [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Russell Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty