rambo_ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cce940ea2b21f4db0e40bdc31be6e8c8193b0bb
-  data.tar.gz: d44fe75445872974782a1d0f79b5da966175897d
+  metadata.gz: f09eb183f2b9312be39e5780bfb21b0adddb54ed
+  data.tar.gz: 77a07451629ce56a2d8b9cc168f254a1bfa06437
 SHA512:
-  metadata.gz: 349fbeddb405567e4276791a1b6682c950a56164403a14f4a788ae3afe546c80c09e654e0ce1155f5df0ae8c8dbeb03f849686eaa2c5bf5cfb4327666af39996
-  data.tar.gz: 355b9f9c0604387b3d4640a853d68bd2cedfbd60016a74d6b9ba3e765ef869550fa0cd7b842af9d7572ce42512ee50f0e46d92991e4eb486b48d708021b06362
+  metadata.gz: b9d9bb934fa6db09a6b241b061ef6cf723ad8c3f532394367af25aa596a941fecabf5f734415c28b7ab81c45c40211809c44972e5fd132e81273e2997194a686
+  data.tar.gz: 550b5fdef3cfab2337dee2845694352bebe9b71fba814465ecc4c61a9fad13a02cbf751aefcd1624003efdf4aa6f240cc3fd9683e567f249f292575b0b1c6ec2

data/README.md

@@ -73,6 +73,8 @@ The two possible keys are:
     to the root of your project directory, is `doc/raml/foobar.raml`, where `foobar.raml` is the first RAML file found in the `doc/raml` directory.
   - `rails` - specifies whether your app is a Rails app. The default value is `true`.
 
+If a `.rambo.yml` file is present and additional options are passed in, the option values that are passed in will override those in the `.rambo.yml` file.
+
 ## Default Behavior
 In order to provide the best user experience to a majority of users, Rambo comes with some sensible defaults that are easily overridden in an optional `.rambo.yml` file, or by using command line flags or a Ruby option hash (see above).
 

data/bin/rambo

@@ -4,7 +4,7 @@ lib = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "fileutils"
-require "rambo/cli"
+require "cli"
 require "optparse"
 
 filename = ARGV[0] ? File.expand_path(ARGV[0], FileUtils.pwd) : nil

data/lib/{rambo/cli.rb → cli.rb}

@@ -1,5 +1,5 @@
 require "colorize"
-require "rambo/document_generator"
+require "rambo"
 
 module Rambo
   class CLI
@@ -16,7 +16,7 @@ module Rambo
       print_logo
 
       begin
-        Rambo::DocumentGenerator.generate!(file, options)
+        Rambo.generate_contract_tests!(file, options)
 
         stdout.puts("Generating contract tests...")
         sleep 0.4
@@ -53,7 +53,7 @@ module Rambo
     end
 
     def logo
-      File.read(File.expand_path("../../../assets/logo.txt", __FILE__))
+      File.read(File.expand_path("../../assets/logo.txt", __FILE__))
     end
   end
 end

data/lib/rambo.rb

@@ -1,12 +1,15 @@
+require "active_support/core_ext/hash"
+
 Dir["#{File.dirname(__FILE__)}/rambo/**/*.rb"].each {|file| require file }
 
 module Rambo
   class << self
     attr_reader :options, :file
 
-    def generate_contract_tests!(file = nil, opts = nil)
-      @options = opts || yaml_options
-      @file    = file || @options.fetch(:raml, nil) || raml_file
+    def generate_contract_tests!(file = nil, opts = {})
+      @options         = yaml_options.merge(opts)
+      @options[:rails] = true unless @options.fetch(:rails, nil) == false
+      @file            = file || @options.delete(:raml) || raml_file
 
       DocumentGenerator.generate!(@file, @options)
     end
@@ -14,10 +17,10 @@ module Rambo
     private
 
     def yaml_options
-      opts = YAML.load(File.read(File.expand_path(".rambo.yml")))
+      opts = YAML.load(File.read(File.expand_path(".rambo.yml"))).symbolize_keys
 
-      if opts && opts.fetch("raml", nil)
-        opts["raml"] = File.expand_path(opts.fetch("raml"))
+      if opts && opts.fetch(:raml, nil)
+        opts[:raml] = File.expand_path(opts.fetch(:raml))
       end
 
       opts
@@ -29,8 +32,10 @@ module Rambo
     #       the first one it finds in the "doc" directory.
 
     def raml_file
-      return options.fetch("raml") if options && options.fetch("raml", nil)
-      Dir.foreach("doc/raml") {|file| return "doc/raml/#{file}" if file.match(/\.raml$/) }
+      return options.fetch(:raml) if options && options.fetch(:raml, nil)
+
+      raml_path = File.expand_path("doc/raml")
+      Dir[raml_path].each {|file| return File.join(raml_path, file) if file.match(/\.raml$/) }
     end
   end
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Rambo
   MAJOR = '0'
   MINOR = '2'
-  PATCH = '0'
+  PATCH = '1'
 
   def self.version
     [Rambo::MAJOR, Rambo::MINOR, Rambo::PATCH].join('.')

data/rambo_ruby.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json_test_data", "~> 1.1", ">= 1.1.1"
   s.add_dependency "json-schema", "~> 2.6"
   s.add_dependency "rake", "~> 11.0"
+  s.add_dependency "activesupport", "~> 4.0"
 
   s.add_development_dependency "cucumber", "~> 2.1"
   s.add_development_dependency "json", "~> 1.7"

data/spec/lib/rambo_spec.rb

@@ -7,11 +7,11 @@ rails: false
   end
 
   describe ".generate_contract_tests!" do
-    let(:valid_file)      { File.join(SPEC_DIR_ROOT, "support/foobar.raml") }
+    let(:valid_file)      { "foobar.raml" }
     let(:default_options) { { rails: true } }
 
     before(:each) do
-      allow(Dir).to receive(:foreach).and_return(valid_file)
+      allow(Dir).to receive(:[]).and_return([valid_file])
     end
 
     context "in all cases" do
@@ -39,15 +39,48 @@ rails: false
       it "sets the RAML file to the one from the file" do
         expect(Rambo::DocumentGenerator)
           .to receive(:generate!)
-          .with(File.expand_path("doc/raml/foobar.raml"), { "raml" => File.expand_path("doc/raml/foobar.raml"), "rails" => false })
+          .with(File.expand_path("doc/raml/foobar.raml"), { rails: false })
 
         Rambo.generate_contract_tests!
       end
+
+      context "rails option set to false in file" do
+        it "sets rails option to false" do
+          allow(Rambo).to receive(:yaml_options).and_return({ rails: false })
+          expect(Rambo::DocumentGenerator)
+            .to receive(:generate!)
+            .with(File.expand_path("doc/raml/foobar.raml"), { rails: false })
+          Rambo.generate_contract_tests!
+        end
+      end
+
+      context "rails option set to true in file" do
+        it "sets rails option to true" do
+          allow(Rambo).to receive(:yaml_options).and_return({ rails: true })
+          expect(Rambo::DocumentGenerator)
+            .to receive(:generate!)
+            .with(File.expand_path("doc/raml/foobar.raml"), { rails: true })
+          Rambo.generate_contract_tests!
+        end
+      end
+
+      context "rails option not set in file" do
+        it "sets rails option to true" do
+          allow(Rambo).to receive(:yaml_options).and_return({})
+          expect(Rambo::DocumentGenerator)
+            .to receive(:generate!)
+            .with(File.expand_path("doc/raml/foobar.raml"), { rails: true })
+          Rambo.generate_contract_tests!
+        end
+      end
     end
 
     context "when there is no .rambo.yml file" do
       it "uses default options" do
-        expect(Rambo::DocumentGenerator).to receive(:generate!).with(valid_file, default_options)
+        expect(Rambo::DocumentGenerator)
+          .to receive(:generate!)
+          .with(File.expand_path("doc/raml/#{valid_file}"), default_options)
+
         Rambo.generate_contract_tests!
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rambo_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -200,8 +214,8 @@ files:
 - features/support/examples/rspec/spec_helper_only_rack_test.rb.example
 - features/support/examples/rspec/spec_helper_rack_test_added.rb.example
 - features/support/foobar.raml
+- lib/cli.rb
 - lib/rambo.rb
-- lib/rambo/cli.rb
 - lib/rambo/document_generator.rb
 - lib/rambo/rake.rb
 - lib/rambo/rake/task.rb
@@ -265,10 +279,10 @@ 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: rambo_ruby-0.2.0
+summary: rambo_ruby-0.2.1
 test_files:
 - features/create_files.feature
 - features/error_modes.feature
@@ -318,4 +332,3 @@ test_files:
 - spec/support/foobar.yml
 - spec/support/multiple_resources.raml
 - spec/support/post_with_request_headers.raml
-has_rdoc: