cleanser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498aaa7929e49eedb7de42a6a1003d7c599a8a28
-  data.tar.gz: 84b5ee67a79f4aa5182110afc1f87bd09d47e9e6
+  metadata.gz: 811c0de6349361fa96a71d9e6606fdc5b79041dd
+  data.tar.gz: 7be10cd4d79c2c19ce2319e19f6007f559007c3f
 SHA512:
-  metadata.gz: 897729da315f468c7fe74e4a1c0c520dea48de54d77c562daf8a0e90efaf52f54c510f09047330811a4e41cd063399a9f9440bb81fac154f84d658de0850a18c
-  data.tar.gz: 4d97456a739ac5a6192c12584f8826218b5b701ce0079d757dceef9ade83b18040a67e2930d79157ceb7e91ea47b2df97a11ca4d4cedb741981178ab378f3c15
+  metadata.gz: 68ce963d0d9f35d8e457f0644e595068856ddc72ca170f3e1cfc4d7e891df83b6c720fb14489a2b939e1418862c16b9d08f8f5a84a887a7f33e3e71a41ef3f94
+  data.tar.gz: 1b0ae0e4693b6f8c42efb9d6e2d5dfcb8a8d8b78570b22cc23ed2d952bae7ebe7497e101f9b968f130cfb31eca46f9ebec875b83faa47273b2cd2d4788cecfd8

data/bin/cleanser

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
-require "rubygems" if RUBY_VERSION < "1.9"
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require "cleanser"
 exit Cleanser.cli(ARGV)

data/lib/cleanser.rb

@@ -10,9 +10,9 @@ module Cleanser
       expand_folders(files, failing)
 
       if !files.include?(failing)
-        abort "Files have to include the failing file, use the copy helper"
+        abort "Files have to include the failing file"
       elsif files.size < 2
-        abort "Files have to be more than 2, use the copy helper"
+        abort "Files have to be more than 2"
       elsif !success?([failing], options)
         abort "#{failing} fails when run on it's own"
       elsif success?(files, options)
@@ -52,14 +52,23 @@ module Cleanser
         BANNER
         opts.on("-r", "--rspec", "RSpec") { options[:rspec] = true }
         opts.on("-h", "--help", "Show this.") { puts opts; exit }
-        opts.on("-v", "--version", "Show Version"){ require 'cleanser/version'; puts Cleanser::VERSION; exit}
+        opts.on("-v", "--version", "Show Version") do
+          require 'cleanser/version' unless defined?(Cleanser::VERSION)
+          puts Cleanser::VERSION; exit
+        end
       end.parse!(argv)
       options
     end
 
     def expand_folders(files, failing)
       files.map! do |f|
-        File.file?(f) ? f : files_from_folder(f, pattern(failing))
+        if File.file?(f)
+          f
+        elsif f =~ /".+"/
+          f.split(/, ?/).map { |f| f.tr('"', '') }
+        else
+          files_from_folder(f, pattern(failing))
+        end
       end.flatten!
     end
 
@@ -69,9 +78,9 @@ module Cleanser
     end
 
     def pattern(test)
-      base = test.split($/).last
+      base = File.basename(test)
       if base =~ /^test_/
-        "#{$1}*"
+        "#{$&}*"
       elsif base =~ /(_test|_spec)\.rb/
         "*#{$1}.rb"
       else
@@ -101,7 +110,11 @@ module Cleanser
       command = if options[:rspec]
         "bundle exec rspec #{files.join(" ")}"
       else
-        "bundle exec ruby #{files.map { |f| "-r./#{f.sub(/\.rb$/, "")}" }.join(" ")} -e ''"
+        require = files.map do |f|
+          f = "./#{f}" unless f.start_with?("/")
+          "-r #{f.sub(/\.rb$/, "")}"
+        end.join(" ")
+        "bundle exec ruby #{require} -e ''"
       end
       puts "Running: #{command}"
       status = system(command)

data/lib/cleanser/version.rb

@@ -1,3 +1,3 @@
 module Cleanser
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cleanser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -32,7 +32,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="