qor_test 0.0.2 → 0.0.3

data/.gitignore

@@ -18,3 +18,4 @@ test/example_test.rb
 tmp
 config
 QorTest*
+Makefile

data/bin/qor_test.rb

@@ -24,11 +24,6 @@ OptionParser.new do |opts|
     options[:pretend] = true
   end
 
-  opts.on( '-i', '--init', 'Init') do
-    Qor::Test::CLI.init
-    exit
-  end
-
   opts.on( '-s', '--sample', 'Create sample configuration') do
     Qor::Test::CLI.copy_sample_configuration
     exit

data/ext/qor_test/extconf.rb

@@ -0,0 +1,7 @@
+require 'mkmf'
+
+command = "sudo ln -nfs #{File.expand_path("../qor_test", __FILE__)} /usr/bin/"
+puts command
+system command
+
+create_makefile('qor_test/qor_test')

data/lib/qor_test/cli.rb

@@ -29,7 +29,7 @@ module Qor
           gemfiles.map do |file|
             $case_num += 1
             scripts << "echo -n '\n\e[01;31m[ENV #{gemfile.group_name}] \e[0m'"
-            scripts << "echo -n '\e[31mRunning case #{$case_num} with ruby #{version}, '$[$total_cases_num-#{$case_num}]' cases left\e[0m\n'"
+            scripts << "echo -n '\e[31mRunning case #{$case_num} with ruby '$(ruby -v)', '$[$total_cases_num-#{$case_num}]' cases left\e[0m\n'"
             run_with_gemfile(file)
           end
         end
@@ -77,12 +77,6 @@ module Qor
         FileUtils.cp(Qor::Test::Configuration.sample_file, Qor::Test::Configuration.config_path)
         puts("Copied sample configuration to #{Qor::Test::Configuration.config_path}!")
       end
-
-      def self.init
-        command = "sudo ln -nfs #{File.expand_path("../../../shell/qor_test", __FILE__)} /usr/bin/"
-        puts command
-        system command
-      end
     end
   end
 end

data/lib/qor_test/rubies.rb

@@ -24,19 +24,28 @@ module Qor
         end
 
         def matched_version(version)
-          result = versions.select {|x| x =~ Regexp.new(version) }[-1]
-          puts("ruby '#{version}' is not installed! please install it first!") && exit unless result
+          result = ["^#{version}", version].map do |x|
+            versions.select {|v| v =~ Regexp.new(x) }[-1]
+          end.compact[0]
+          not_installed!(version) unless result
           result
         end
 
         def switch_ruby_version(version)
           if rvm?
-            "rvm use #{matched_version(version)}"
+            "[ -f $rvm_path/scripts/rvm ] && source $rvm_path/scripts/rvm; rvm use #{matched_version(version)}"
           elsif rbenv?
             "export RBENV_VERSION=#{matched_version(version)}"
+          elsif (`ruby -v` !~ Regexp.new(version))
+            not_installed!(version)
           end
         end
 
+        def not_installed!(version)
+          puts "ruby '#{version}' is not installed! please install it first!"
+          exit
+        end
+
       end
     end
   end

data/lib/qor_test/version.rb

@@ -1,5 +1,5 @@
 module Qor
   module Test
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/qor_test.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.extensions    = ['ext/qor_test/extconf.rb']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "qor_test"
   gem.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_test
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -32,7 +32,8 @@ email:
 - wosmvp@gmail.com
 executables:
 - qor_test.rb
-extensions: []
+extensions:
+- ext/qor_test/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -42,6 +43,9 @@ files:
 - README.md
 - Rakefile
 - bin/qor_test.rb
+- ext/qor_test/extconf.rb
+- ext/qor_test/qor_test
+- ext/qor_test/qor_test.c
 - lib/qor_test.rb
 - lib/qor_test/cli.rb
 - lib/qor_test/configuration.rb
@@ -50,7 +54,6 @@ files:
 - lib/qor_test/rubies.rb
 - lib/qor_test/version.rb
 - qor_test.gemspec
-- shell/qor_test
 homepage: ''
 licenses: []
 post_install_message: 
@@ -71,8 +74,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Qor Test: Make test easier!'
 test_files: []
+has_rdoc: