qor_test 0.0.5 → 0.1.0

data/README.md

@@ -8,7 +8,7 @@
 
 ## Usage
 
-  First write a configuration file like below:
+  QorTest require a configuration file to know those dependencies and rubies need to be tested, For example:
 
     # config/qor/test.rb
     env '2.0' do
@@ -27,24 +27,24 @@
       gem 'rails', [3.1, 3.2]
     end
 
-  Then QorTest will generate 6 test cases according to it.
+  With above configuration, QorTest could generate 6 test cases.
 
-    1, run tests with rails 3.1 and ruby 2.0
-    2, run tests with rails 3.2 and ruby 2.0
-    3, run tests with rails 3.1 and ruby 1.9
-    4, run tests with rails 3.2 and ruby 1.9
-    5, run tests with rails 3.1 and ruby 1.8
-    6, run tests with rails 3.2 and ruby 1.8
+    1, Run tests with Rails 3.1 and Ruby 2.0
+    2, Run tests with Rails 3.2 and Ruby 2.0
+    3, Run tests with Rails 3.1 and Ruby 1.9
+    4, Run tests with Rails 3.2 and Ruby 1.9
+    5, Run tests with Rails 3.1 and Ruby 1.8
+    6, Run tests with Rails 3.2 and Ruby 1.8
 
-   Then run all above 6 cases in your project root by running
+  To run "tests" of above 6 cases, you could run `qor_test` in your project root:
 
       qor_test
 
-   Or only run those two cases in the '2.0' env by running
+   Or run those two cases in env '2.0' only by running
 
       qor_test -e '2.0'
 
-  All dependencies definitions outside env definition will be shared in all envs, so you could also simplify above configuration like below, it's the same!
+  All dependencies definitions outside env definition will be shared in all envs, so you could simplify above configuration like below, it's the same!
 
     # config/qor/test.rb
     gem 'rails', [3.1, 3.2]
@@ -62,7 +62,7 @@
       gem 'factory_girl_rails', '1.3.0'
     end
 
-  And you could write more advanced configuration:
+  Or you can write more advanced configuration:
 
     # config/qor/test.rb
     ruby '2.0'
@@ -73,9 +73,10 @@
     gem 'rails', [3.1, 3.2]
     gem 'devise', [2.2.0, 2.1.0, 2.0.0]
 
-  With it, QorTest will generate 54 test cases! (3 rubies x 3 paperclip x 2 rails x 3 devise), so it is dead easy to discover hidden compatibility issues!
+  With it, QorTest will generate 54 test cases! (3 rubies x 3 paperclip x 2 rails x 3 devise), is it dead easy to discover hidden compatibility issues?
 
-  Running `qor_test` will use `rake spec` to run tests in each case for projects using rspec and `rake test` for others. but you could specify the test command by overwrite the environment variable 'COMMAND', e.g:
+
+  Running `qor_test` will use command `rake spec` to run "tests" in each case for projects using rspec and `rake test` for others. but you could specify the test command by overwrite the environment variable 'COMMAND', e.g:
 
     COMMAND='ruby test/xxxx.rb' qor_test
 
@@ -88,5 +89,6 @@
 5. Create new Pull Request
 
 ## Author ##
-**Jinzhu**
-* <http://github.com/jinzhu>
+Jinzhu <http://github.com/jinzhu>
+
+* A Product From ThePlant <http://theplant.jp>

data/lib/qor_test/gem.rb

@@ -1,29 +1,28 @@
 module Qor
   module Test
     class Gem
-      attr_accessor :name, :options, :gem_option
+      attr_accessor :name, :options
 
       def initialize(node, gem_option=nil)
         self.name = node.name.to_s
-        self.gem_option = gem_option
+        self.options = gem_option.is_a?(Array) ? gem_option : [gem_option]
 
         [:git, :path, :platforms].map do |type|
           if node.parent.is_node?(type)
-            self.options = {type => node.parent.value}.merge(node.parent.options)
+            parent_option = {type => node.parent.value}.merge(node.parent.options)
+            if options[-1].is_a?(Hash)
+              self.options[-1] = parent_option.merge(options[-1])
+            else
+              self.options.push(parent_option)
+            end
           end
         end
       end
 
       def to_s
-        if gem_option.is_a?(Array) && gem_option.length > 0
-          %{gem "#{name}", #{gem_option.map(&:inspect).join(", ")}}
-        elsif !gem_option.nil? && !gem_option.is_a?(Array)
-          %{gem "#{name}", #{gem_option.inspect}}
-        elsif options.is_a?(Hash)
-          %{gem "#{name}", #{options.inspect}}
-        else
-          %{gem "#{name}"}
-        end
+        result = %{gem "#{name}"}
+        result += %{, #{options.map(&:inspect).join(", ")}} if options.length > 0
+        result
       end
 
       def self.parse(node)

data/lib/qor_test/gemfile.rb

@@ -35,17 +35,19 @@ module Qor
         end
       end
 
-      def write_gemfile(gems_from_config, gems_from_gemfile, filename)
+      def generate_gems_entry(gems_from_config, gems_from_gemfile)
         gem_names = [gems_from_config.keys, gems_from_gemfile.keys].flatten.compact.uniq
 
-        gems = gem_names.map do |name|
+        gem_names.map do |name|
           gems_from_config[name] || gems_from_gemfile[name]
-        end.compact
+        end.compact.map(&:to_s).join("\n")
+      end
 
+      def write_gemfile(gems_from_config, gems_from_gemfile, filename)
         File.open(filename, "w+") do |f|
           f << Qor::Test::Configuration.combined_sources(options)
           f << Qor::Test::Configuration.combined_gemspecs(options)
-          f << gems.map(&:to_s).join("\n")
+          f << generate_gems_entry(gems_from_config, gems_from_gemfile)
         end.path
       end
     end

data/lib/qor_test/version.rb

@@ -1,5 +1,5 @@
 module Qor
   module Test
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

data/test/gem_test.rb

@@ -0,0 +1,98 @@
+require 'minitest/autorun'
+require 'qor_test'
+
+describe Gem do
+  it "gem to string" do
+    # case 1
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem "rails", "3.1"
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 1
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "rails", "3.1"'
+
+    # case 2
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem "rails", ["3.1", "3.2"]
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 2
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "rails", "3.1"'
+    Qor::Test::Gem.parse(config.first("gem"))[1].to_s.must_equal 'gem "rails", "3.2"'
+
+    # case 3
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem 'nokogiri', [{:git => "git://github.com/tenderlove/nokogiri.git", :branch => "1.4"}, {:git => "git://github.com/tenderlove/nokogiri.git"}]
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 2
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git", :branch=>"1.4"}'
+    Qor::Test::Gem.parse(config.first("gem"))[1].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git"}'
+
+    # case 4
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem 'nokogiri', :git => "git://github.com/tenderlove/nokogiri.git", :branch => "1.4"
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 1
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git", :branch=>"1.4"}'
+
+    # case 5
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem 'RedCloth', ">= 4.1.0", "< 4.2.0"
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 1
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "RedCloth", ">= 4.1.0", "< 4.2.0"'
+
+    # case 6
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      git "git://github.com/tenderlove/nokogiri.git" do
+        gem 'nokogiri', '1.4'
+      end
+    end
+
+    Qor::Test::Gem.parse(config.deep_find("gem")[0]).length.must_equal 1
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[0].to_s.must_equal 'gem "nokogiri", "1.4", {:git=>"git://github.com/tenderlove/nokogiri.git"}'
+
+    # case 7
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      git "git://github.com/tenderlove/nokogiri.git" do
+        gem 'nokogiri', :branch => '1.4'
+      end
+    end
+
+    Qor::Test::Gem.parse(config.deep_find("gem")[0]).length.must_equal 1
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[0].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git", :branch=>"1.4"}'
+
+    # case 8
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      gem "rails"
+    end
+
+    Qor::Test::Gem.parse(config.first("gem")).length.must_equal 1
+    Qor::Test::Gem.parse(config.first("gem"))[0].to_s.must_equal 'gem "rails"'
+
+    # case 9
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      git "git://github.com/tenderlove/nokogiri.git" do
+        gem 'nokogiri', ['1.4', '2.0']
+      end
+    end
+
+    Qor::Test::Gem.parse(config.deep_find("gem")[0]).length.must_equal 2
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[0].to_s.must_equal 'gem "nokogiri", "1.4", {:git=>"git://github.com/tenderlove/nokogiri.git"}'
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[1].to_s.must_equal 'gem "nokogiri", "2.0", {:git=>"git://github.com/tenderlove/nokogiri.git"}'
+
+    # case 10
+    config = Qor::Test::Configuration.load(nil, :force => true) do
+      git "git://github.com/tenderlove/nokogiri.git" do
+        gem 'nokogiri', [{:branch => '1.4'}, {:branch => '2.0'}]
+      end
+    end
+
+    Qor::Test::Gem.parse(config.deep_find("gem")[0]).length.must_equal 2
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[0].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git", :branch=>"1.4"}'
+    Qor::Test::Gem.parse(config.deep_find("gem")[0])[1].to_s.must_equal 'gem "nokogiri", {:git=>"git://github.com/tenderlove/nokogiri.git", :branch=>"2.0"}'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_test
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qor_dsl
@@ -54,6 +54,7 @@ files:
 - lib/qor_test/rubies.rb
 - lib/qor_test/version.rb
 - qor_test.gemspec
+- test/gem_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -78,5 +79,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Qor Test: Make test easier!'
-test_files: []
+test_files:
+- test/gem_test.rb
 has_rdoc: