rainforest-cli 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjNhOTdmMWViMTU0OTIwNzE1NTI5YzkzZTc3NzgxZjIyY2Y3MTY2OQ==
-  data.tar.gz: !binary |-
-    Y2MwYTljZWQ2Zjg5ODE0ZmIzMTM3M2E2Y2MwYWM4MzFkMDk5ZWFjOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODlmZTMzNjIzMzQ1NjhiYTM0ZTZiNWQ5Nzk2ZjE0N2RmODI2Y2VmMGMyNWZl
-    ZDQ0ODljM2FlZDM0OWMxN2E3NjBiNjNkZTQ2MTE2ZGQ5NWRiM2NiYjhjOTA0
-    YTllZWMwMGQwYzQxODI0YTA3NTQ1ODc5YTU5ZmQxMmI2OWRlZWI=
-  data.tar.gz: !binary |-
-    ZTgzN2M1NzE3N2U1NjQ5Yzg0NmVhNjM3MmFkZTI1YzA3MzhhZTk1YTY4ZDQ0
-    YjQ4OTljZDQ2ZWYwM2QyYTUxMDM5OWIxNWZkMzYwMjQ0ZDA4ZWI5NmQzYmRh
-    Y2Y2ODhmNGYzYTVmZTk4ZDczYzkwYjVhNzBiODY3ZmNlMzIyYzI=
+SHA1:
+  metadata.gz: 72def45d00f529b7b7c35d23b097dbe3e0e0ea89
+  data.tar.gz: 0a6312c46e0862e24272881e6adb6fc22c477423
+SHA512:
+  metadata.gz: 1a1c28ebb3bce9b4ef7788b75c098055f7b83f588d1797a547d44c65d7490cef80ccb43179873f8fbcbd9d5dac095bc567d40904c3dd596f0d2cb011d9623579
+  data.tar.gz: 4a37fbeb379b70c1f7b8b284ff5f61c56fc02c7a26a35f8b893bdb53879ed48a2ce0fd3954670db3cab7a8f0b24aca467c48fbe34b56e991191b384ba9fbf8b4

data.tar.gz.sig

@@ -0,0 +1 @@
+�?��̛��Ɛ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�'���

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 tags
+
+*.csv

data/.rspec

@@ -1,4 +1,3 @@
 --color
---format=nested
 --require spec_helper
 --profile

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3@rainforest-cli --create
+rvm use 2.1.2@rainforest-cli --create

data/.travis.yml

@@ -2,9 +2,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
-  - rbx-2.1.1
   - ruby-head
-  - jruby-head
 
 script: bundle exec rspec spec

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "rspec"
+  gem "rspec", "2.14"
 end

data/lib/rainforest/cli.rb

@@ -1,14 +1,28 @@
 require "rainforest/cli/version"
 require "rainforest/cli/options"
+require "rainforest/cli/csv_importer"
 require "httparty"
 require "json"
 
 module Rainforest
   module Cli 
-    API_URL = 'https://app.rainforestqa.com/api/1/runs'
-
+    API_URL = 'https://app.rainforestqa.com/api/1'.freeze
+    
     def self.start(args)
       @options = OptionParser.new(args)
+      
+      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
+        puts "You must pass both --import-variable-csv-file and --import-variable-name"
+        exit 2
+      end
 
       post_opts = {}
       if !@options.tags.empty?
@@ -23,7 +37,7 @@ module Rainforest
 
       puts "Issuing run"
 
-      response = post(API_URL, post_opts)
+      response = post(API_URL + '/runs', post_opts)
 
       if response['error']
         puts "Error starting your run: #{response['error']}"
@@ -37,7 +51,7 @@ module Rainforest
 
       while running 
         Kernel.sleep 5
-        response = get "#{API_URL}/#{run_id}?gem_version=#{Rainforest::Cli::VERSION}"
+        response = get "#{API_URL}/runs/#{run_id}?gem_version=#{Rainforest::Cli::VERSION}"
         if response 
           if %w(queued in_progress sending_webhook waiting_for_callback).include?(response["state"])
             puts "Run #{run_id} is #{response['state']} and is #{response['current_progress']['percent']}% complete"
@@ -54,6 +68,24 @@ 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
+    end
+
+    def self.delete(url, body = {})
+      response = HTTParty.delete url, {
+        body: body, 
+        headers: {"CLIENT_TOKEN" => @options.token}
+      }
+      
+      JSON.parse(response.body)
+    end
 
     def self.post(url, body = {})
       response = HTTParty.post url, {

data/lib/rainforest/cli/csv_importer.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+require 'csv'
+require 'httparty'
+require 'parallel'
+require 'ruby-progressbar'
+
+module Rainforest
+  module Cli
+    class CSVImporter
+      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})
+      end
+
+      def row_data columns, values
+        Hash[(columns.map {|c| c['id']}).zip(values)]
+      end
+
+      def import
+        rows = []
+        CSV.foreach(@file, encoding: 'windows-1251:utf-8') do |row|
+          rows << row
+        end
+
+        # Create the generator
+        columns = rows.shift.map do |column|
+          {name: column.downcase.strip.gsub(/\s/, '_')}
+        end
+        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
+        puts "\t[OK]"
+        
+        @columns = response['columns']
+        @generator_id = response['id']
+
+        puts "Uploading data..."
+        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
+        end
+      end
+    end
+  end
+end

data/lib/rainforest/cli/options.rb

@@ -10,7 +10,7 @@ module Rainforest
     end
 
     class OptionParser
-      attr_reader :command, :token, :tags, :conflict, :browsers
+      attr_reader :command, :token, :tags, :conflict, :browsers, :import_file_name, :import_name
 
       VALID_BROWSERS = %w{chrome firefox safari ie8 ie9}.freeze
 
@@ -20,6 +20,14 @@ module Rainforest
         @browsers = nil
 
         @parsed = ::OptionParser.new do |opts|
+          opts.on("--import-variable-csv-file FILE", "Import 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|
+            @import_name = value
+          end
+
           opts.on("--fg", "Run the tests in foreground.") do |value|
             @foreground = value
           end

data/lib/rainforest/cli/version.rb

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

data/rainforest-cli.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Rainforest::Cli::VERSION
   spec.authors       = ["Simon Mathieu", "Russell Smith"]
   spec.email         = ["simon@rainforestqa.com", "russ@rainforestqa.com"]
-  spec.description   = %q{Command line utility for RainforestQA}
-  spec.summary       = %q{Command line utility for RainforestQA}
+  spec.description   = %q{Command line utility for Rainforest QA}
+  spec.summary       = %q{Command line utility for Rainforest QA}
   spec.homepage      = "https://www.rainforestqa.com/"
   spec.license       = "MIT"
 
@@ -19,6 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "httparty"
+  spec.add_dependency "parallel"
+  spec.add_dependency "ruby-progressbar"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  
+  spec.cert_chain  = ['certs/ukd1.pem']
+  spec.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 end

data/spec/options_spec.rb

@@ -1,6 +1,16 @@
 describe Rainforest::Cli::OptionParser do
   subject { Rainforest::Cli::OptionParser.new(args) }
 
+  context "importing csv file" do
+    let(:args) { ["--import-variable-csv-file", "some_file.csv"] }
+    its(:import_file_name) { should == "some_file.csv" }
+  end
+
+  context "importing name" do
+    let(:args) { ["--import-variable-name", "some_name"] }
+    its(:import_name) { should == "some_name" }
+  end
+
   context "run all tests" do
     let(:args) { ["run", "all"] }
     its(:tests) { should == ["all"]}

metadata

@@ -1,59 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Simon Mathieu
 - Russell Smith
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----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-----
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Command line utility for RainforestQA
+description: Command line utility for Rainforest QA
 email:
 - simon@rainforestqa.com
 - russ@rainforestqa.com
@@ -62,10 +113,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -73,6 +124,7 @@ files:
 - Rakefile
 - bin/rainforest
 - lib/rainforest/cli.rb
+- lib/rainforest/cli/csv_importer.rb
 - lib/rainforest/cli/options.rb
 - lib/rainforest/cli/version.rb
 - rainforest-cli.gemspec
@@ -89,20 +141,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Command line utility for RainforestQA
+summary: Command line utility for Rainforest QA
 test_files:
 - spec/cli_spec.rb
 - spec/options_spec.rb