rainforest-cli 1.0.6 → 1.1.0

data/lib/rainforest/cli/test_parser.rb

@@ -0,0 +1,100 @@
+module RainforestCli::TestParser
+  class EmbeddedTest < Struct.new(:test_name)
+    def to_s
+      "--> embed: #{test_name}"
+    end
+  end
+
+  class Step < Struct.new(:action, :response)
+    def to_s
+      "#{action} --> #{response}"
+    end
+  end
+
+  class Error < Struct.new(:line, :reason)
+    def to_s
+      "Line #{line}: #{reason}"
+    end
+  end
+
+  class Test < Struct.new(:id, :description, :title, :start_uri, :steps, :errors, :tags, :browsers)
+  end
+
+  class Parser
+    attr_reader :steps, :errors, :text
+
+    def initialize(text)
+      @text = text.to_s
+
+      @test = Test.new
+      @test.description = ""
+      @test.steps = []
+      @test.errors = {}
+      @test.tags = []
+      @test.browsers = []
+    end
+
+    TEXT_FIELDS = [:start_uri, :title, :tags].freeze
+    CSV_FIELDS = [:tags, :browsers].freeze
+
+    def process
+      scratch = []
+
+      text.lines.map(&:chomp).each_with_index do |line, line_no|
+        if line[0..1] == '#!'
+          # special comment, don't ignore!
+          @test.id = line[2..-1].strip.split(" ")[0]
+          @test.description += line[1..-1] + "\n"
+
+        elsif line[0] == '#'
+          # comment, store in description
+          @test.description += line[1..-1] + "\n"
+
+          (CSV_FIELDS + TEXT_FIELDS).each do |field|
+            next unless line[1..-1].strip[0..(field.length)] == "#{field}:"
+
+            # extract just the text of the field
+            @test[field] = line[1..-1].split(" ")[1..-1].join(" ").strip
+
+            # if it's supposed to be a CSV field, split and trim it
+            if CSV_FIELDS.include?(field)
+              @test[field] = @test[field].split(',').map(&:strip).map(&:downcase)
+            end
+          end
+
+        elsif scratch.count == 0 && line.strip != ''
+          if line[0] == '-'
+            @test.steps << EmbeddedTest.new(line[1..-1].strip)
+          else
+            scratch << line.strip
+          end
+
+        elsif scratch.count == 1
+          if line.strip == ''
+            @test.errors[line_no] = Error.new(line_no, "Missing question")
+          elsif !line.include?('?')
+            @test.errors[line_no] = Error.new(line_no, "Missing ?")
+          else
+            scratch << line.strip
+          end
+
+        end
+
+        if @test.errors.has_key?(line_no)
+          scratch = []
+        end
+
+        if scratch.count == 2
+          @test.steps << Step.new(scratch[0], scratch[1])
+          scratch = []
+        end
+      end
+
+      if @test.id == nil
+        @test.errors[0] = Error.new(0, "Missing test ID. Please start a line #! followed by a unique id.")
+      end
+
+      return @test
+    end
+  end
+end

data/lib/rainforest/cli/version.rb

@@ -1,5 +1,3 @@
-module Rainforest
-  module Cli
-    VERSION = "1.0.6"
-  end
+module RainforestCli
+  VERSION = "1.1.0"
 end

data/rainforest-cli.gemspec

@@ -5,7 +5,7 @@ require 'rainforest/cli/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rainforest-cli"
-  spec.version       = Rainforest::Cli::VERSION
+  spec.version       = RainforestCli::VERSION
   spec.authors       = ["Simon Mathieu", "Russell Smith"]
   spec.email         = ["simon@rainforestqa.com", "russ@rainforestqa.com"]
   spec.description   = %q{Command line utility for Rainforest QA}
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "parallel"
   spec.add_dependency "ruby-progressbar"
+  spec.add_dependency "rainforest"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/cli_spec.rb

@@ -1,5 +1,5 @@
-describe Rainforest::Cli do
-  let(:http_client) { Rainforest::Cli::HttpClient.any_instance }
+describe RainforestCli do
+  let(:http_client) { RainforestCli::HttpClient.any_instance }
 
   before do
     Kernel.stub(:sleep)
@@ -52,7 +52,7 @@ describe Rainforest::Cli do
       end
 
       before do
-        Rainforest::Cli::GitTrigger.stub(:last_commit_message) { commit_message }
+        RainforestCli::GitTrigger.stub(:last_commit_message) { commit_message }
       end
 
       describe "with tags parameter passed" do
@@ -134,7 +134,7 @@ describe Rainforest::Cli do
       end
 
       it "starts the run with site_id and environment_id" do
-        Rainforest::Cli::Runner.any_instance.stub(get_environment_id: 333)
+        RainforestCli::Runner.any_instance.stub(get_environment_id: 333)
 
         http_client.should_receive(:post).with(
           "/runs",
@@ -148,7 +148,7 @@ describe Rainforest::Cli do
       let(:params) { %w(--token x --environment 123) }
 
       it "starts the run with environment_id" do
-        Rainforest::Cli::Runner.any_instance.stub(get_environment_id: 333)
+        RainforestCli::Runner.any_instance.stub(get_environment_id: 333)
 
         http_client.should_receive(:post).with(
           "/runs",

data/spec/csv_importer_spec.rb

@@ -1,4 +1,4 @@
-describe Rainforest::Cli::CSVImporter do
+describe RainforestCli::CSVImporter do
   let(:csv_file) { "#{File.dirname(__FILE__)}/fixtures/variables.txt" }
 
   describe '.import' do
@@ -15,7 +15,7 @@ describe Rainforest::Cli::CSVImporter do
     end
 
     before do
-      Rainforest::Cli::HttpClient.stub(:new).and_return(http_client)
+      RainforestCli::HttpClient.stub(:new).and_return(http_client)
     end
 
     it 'should post the schema to the generators API' do

data/spec/git_trigger_spec.rb

@@ -1,4 +1,4 @@
-describe Rainforest::Cli::GitTrigger do
+describe RainforestCli::GitTrigger do
   subject { described_class }
 
   let(:default_dir) { __dir__ }

data/spec/options_spec.rb

@@ -1,5 +1,5 @@
-describe Rainforest::Cli::OptionParser do
-  subject { Rainforest::Cli::OptionParser.new(args) }
+describe RainforestCli::OptionParser do
+  subject { RainforestCli::OptionParser.new(args) }
 
   describe "#initialize" do
     context "importing csv file" do
@@ -38,7 +38,7 @@ describe Rainforest::Cli::OptionParser do
       let(:args) { ["run", "--browsers", "lulbrower"] }
 
       it "raises an exception" do
-        expect{subject}.to raise_error(Rainforest::Cli::BrowserException)
+        expect{subject}.to raise_error(RainforestCli::BrowserException)
       end
     end
 
@@ -65,8 +65,15 @@ describe Rainforest::Cli::OptionParser do
     end
 
     context "it parses the conflict flag" do
-      let(:args) { ["run", "--conflict", "abort",  "all"] }
-      its(:conflict) { should == "abort"}
+      context "when abort" do
+        let(:args) { ["run", "--conflict", "abort",  "all"] }
+        its(:conflict) { should == "abort"}
+      end
+
+      context "when abort-all" do
+        let(:args) { ["run", "--conflict", "abort-all", "all"]}
+        its(:conflict) { should == "abort-all" }
+      end
     end
 
     context "it parses the fail-fast flag" do

data/spec/runner_spec.rb

@@ -1,6 +1,6 @@
-describe Rainforest::Cli::Runner do
+describe RainforestCli::Runner do
   let(:args) { %w(run all) }
-  let(:options) { Rainforest::Cli::OptionParser.new(args) }
+  let(:options) { RainforestCli::OptionParser.new(args) }
   subject { described_class.new(options) }
 
   describe "#get_environment_id" do

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@
 
 require "rainforest/cli"
 
-Rainforest::Cli.logger = Logger.new(StringIO.new)
+RainforestCli.logger = Logger.new(StringIO.new)
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon Mathieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainforest
+  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
@@ -108,6 +122,8 @@ files:
 - lib/rainforest/cli/http_client.rb
 - lib/rainforest/cli/options.rb
 - lib/rainforest/cli/runner.rb
+- lib/rainforest/cli/test_importer.rb
+- lib/rainforest/cli/test_parser.rb
 - lib/rainforest/cli/version.rb
 - rainforest-cli.gemspec
 - spec/cli_spec.rb
@@ -137,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command line utility for Rainforest QA