rainforest-cli 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba717beff0c92befa7902d611e480080e717c607
-  data.tar.gz: 377bbc58b3ea971c1a028db37480245dfa808dc7
+  metadata.gz: a4691d682cea9f0800d51a9b83efa292c0dacccd
+  data.tar.gz: f213e7432e7a48f8c6d3ae797d3d5df41ab86b2d
 SHA512:
-  metadata.gz: daa1731fd6dab4c06c3d6f5ed07a81f7104b299498476eda2b370913e86dac4ebaf4dabc799305dfd647af5a5792949154bef81e8692a68f5a640bb3e4715606
-  data.tar.gz: 3bd19eb1863e67789b83aa6bf7597c61cf0a7d01cf442a7cc149ffb3fdad84b819e10246a4f51b64587392f549fa6e3c12fc381040f0ca7bdfa26c013b514bf8
+  metadata.gz: bfa83c307d2fed9acd62bac1517d55ffe8bbabba2644f753c7a2dd5b2ce6c5f4a3188c068d9c98b46de95909387d3eb905a7a3c4ff69f1e953a3958b6b4770c3
+  data.tar.gz: 0566f2c4a89978464b52492d38b07607a57f8f63f55604e18a6a60dd649a9b2e17316a2fa8378d18b2e51ce29e5e847ce2c984b8d314290952506a7a0f7befee

data/README.md

@@ -14,7 +14,7 @@ You can install rainforest-cli with the [gem](https://rubygems.org/) utility.
 gem install rainforest-cli
 ```
 
-Alternatively, you can add to your Gemfile if you're in a ruby project.
+Alternatively, you can add to your Gemfile if you're in a ruby project. This is *not recommended* for most users. The reason being that we update this gem frequently and you usually want to ensure you have the latest version.
 
 ```ruby
 gem "rainforest-cli", require: false

data/lib/rainforest/cli/csv_importer.rb

@@ -7,14 +7,12 @@ require 'ruby-progressbar'
 module Rainforest
   module Cli
     class CSVImporter
+      attr_reader :client
+
       def initialize name, file, token
         @generator_name = name
         @file = file
-        @token = token
-      end
-
-      def post url, body
-        HTTParty.post(Rainforest::Cli::API_URL + url, body: body.to_json, headers: {'Content-Type' => 'application/json', "CLIENT_TOKEN" => @token})
+        @client = HttpClient.new token: token
       end
 
       def row_data columns, values
@@ -34,10 +32,10 @@ module Rainforest
         raise 'Invalid schema in CSV. You must include headers in first row.' if not columns
 
         print "Creating custom step variable"
-        response = post "/generators", { name: @generator_name, description: @generator_name, columns: columns }
-        raise "Error creating custom step variable: #{response.code}, #{response.body}" unless response.code == 201
+        response = client.post "/generators", { name: @generator_name, description: @generator_name, columns: columns }
+        raise "Error creating custom step variable: #{response['error']}" if response['error']
         puts "\t[OK]"
-        
+
         @columns = response['columns']
         @generator_id = response['id']
 
@@ -45,11 +43,11 @@ module Rainforest
         p = ProgressBar.create(title: 'Rows', total: rows.count, format: '%a %B %p%% %t')
 
         # Insert the data
-        Parallel.each(rows, in_processes: 16, finish: lambda { |item, i, result| p.increment }) do |row|
-          response = post("/generators/#{@generator_id}/rows", {data: row_data(@columns, row)})
-          raise response.to_json unless response.code == 201
+        Parallel.each(rows, in_threads: 16, finish: lambda { |item, i, result| p.increment }) do |row|
+          response = client.post("/generators/#{@generator_id}/rows", {data: row_data(@columns, row)})
+          raise response['error'] if response['error']
         end
       end
     end
   end
-end
+end

data/lib/rainforest/cli/version.rb

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

data/spec/csv_importer_spec.rb

@@ -0,0 +1,49 @@
+describe Rainforest::Cli::CSVImporter do
+  let(:csv_file) { "#{File.dirname(__FILE__)}/fixtures/variables.txt" }
+
+  describe '.import' do
+    subject { described_class.new('variables', csv_file, 'abc123') }
+
+    let(:http_client) { double }
+    let(:columns) { %w(email pass) }
+
+    let(:success_response) do
+      {
+        'id' => 12345,
+        'columns' => columns.each_with_index.map { |col, i| { 'id' => i, 'name' => col } }
+      }
+    end
+
+    before do
+      Rainforest::Cli::HttpClient.stub(:new).and_return(http_client)
+    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
+    end
+  end
+end

data/spec/fixtures/variables.txt

@@ -0,0 +1,3 @@
+email,pass
+russ@rainforestqa.com,abc123
+bob@example.com,hunter2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Simon Mathieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -111,6 +111,8 @@ files:
 - lib/rainforest/cli/version.rb
 - rainforest-cli.gemspec
 - spec/cli_spec.rb
+- spec/csv_importer_spec.rb
+- spec/fixtures/variables.txt
 - spec/git_trigger_spec.rb
 - spec/options_spec.rb
 - spec/runner_spec.rb
@@ -141,6 +143,8 @@ specification_version: 4
 summary: Command line utility for Rainforest QA
 test_files:
 - spec/cli_spec.rb
+- spec/csv_importer_spec.rb
+- spec/fixtures/variables.txt
 - spec/git_trigger_spec.rb
 - spec/options_spec.rb
 - spec/runner_spec.rb