fun_with_gems 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ2MWFiMGFiMjIzYWZiYmJjM2UzZDZlZTIxZDZlZDZhNGIxNzc1YQ==
+    NDBlNDZkZDFkODc4YmNkNDcxYWU0YmFjNGI4ZjBlNjQ5ZmJlZDRhNQ==
   data.tar.gz: !binary |-
-    ZWU1MTRmMDBjMzIzMTZlZjJlYzFhMGMxMWNjNTlmZjQ3MWZkNWQ0OA==
+    MGY2YjUxZDM3MjJhM2I1ZDI0YzA4ZjBhNWJlYTAxYTA2NDA0ZTBlMw==
 SHA512:
   metadata.gz: !binary |-
-    NzYxZDVhYzVmNWMxZGE2NWRmYjZjNmRiYzg2YWZmYTg2NzdmYjMzOTFhNjVm
-    MDczNWE3NGUyNzZkY2NkNGI2MjQwZDBjMTEyNDgzNDc1ZmNmZTI5NzFiZjkz
-    NzkzY2E1MDZhODkyYjIyNmQwMDk3NzJlMWM2MDY4Nzc2NGEzODY=
+    YTY4YzA1NGI5OWNmODU3NzE5ODY3OGI4NzE0YzA3MmVlZGE0ZTI2ZGQxNzIx
+    ZGFjMjhlNjBlZjFkNzhmYjk5Y2YyNmIzOGQzZjQxNDQ5ODExYzRkMzY2NDY5
+    Mjc4NDJhNGQ2YzA3MGVmYzdkMzIxMjMxZWMxMzdkZDhkZjMyNjg=
   data.tar.gz: !binary |-
-    NzQyMTZkZWYxMDI4N2RlYzY3ZjEzODQyZDUwODVmMzQ4NWQ2MDc5NGVlNjBl
-    ZjMzMTU0OTZjOWFmYzA5ZTczNGZlNDYwOGI0NGRhMWE3NzRiNTlkOWJmNzAy
-    MDU4MTAxYTcyOWE0MjQzMGEwMjMxOWZkNDM5MjYxZDk5MDUzZDc=
+    NDA2OTNjODAwZWRmNjk4NGY0MjIyNGRhZDYwZjI0Nzc3MDcxNWYxYTQwZGI2
+    NjkwNWZlYzQ1NDlmYmZhYWIyYjZmMzgzM2EwMTFkNjJmODdiY2ViYjM3ZDBk
+    Zjg0M2RmZmQzMmM1NDRhOWYyNDg4OWEyMzY0MjMzNGU1NzI2MDE=

data/CHANGELOG.markdown

@@ -1,11 +1,19 @@
 CHANGELOG
 =========
 
+v0.0.3
+------
+
+Moved some of the standard Rakefile boilerplate into FunWith::Gems::Rakefile.  Goal is to simplify rakefiles, add a set of fun_with:gems: rake tasks, etc.
+Removed Mechanic (seemed pretty useless)
+
+
 v0.0.2
 ------
 
 Dependent on `fun_with_testing` and `fun_with_files`, even `fun_with_version_strings`.  It's all very silly, really.
 
+
 0.0.1
 -----
 

data/Gemfile

@@ -16,6 +16,6 @@ group :development do
   gem "fun_with_testing", "~> 0.0"
 end
 
-gem "fun_with_files", "~> 0.0", ">= 0.0.7"
+gem "fun_with_files", "~> 0.0", ">= 0.0.13"
 gem "fun_with_version_strings", "~> 0.0", ">= 0.0.3"
 

data/Rakefile

@@ -1,55 +1,23 @@
 # encoding: utf-8
+require_relative 'lib/fun_with_gems'
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+FunWith::Gems::Rakefile.setup FunWith::Gems, self
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+# Completely pointless wrapper for Jeweler::Tasks.new
+FunWith::Gems::Rakefile.specification do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "fun_with_gems"
-  gem.homepage = "http://github.com/darthschmoo/fun_with_gems"
-  gem.license = "MIT"
-  gem.summary = "Dependency for most of my FunWith:: gems.  Not much use standalone."
+  gem.name        = "fun_with_gems"
+  gem.homepage    = "http://github.com/darthschmoo/fun_with_gems"
+  gem.license     = "MIT"
+  gem.summary     = "Dependency for most of my FunWith:: gems.  Not much use standalone."
   gem.description = "Dependency for FunWith gems, simplifies the setup of new gems, installing version data, root filepath, and default requirements."
-  gem.email = "keeputahweird@gmail.com"
-  gem.authors = ["Bryce Anderson"]
+  gem.email       = "keeputahweird@gmail.com"
+  gem.authors     = ["Bryce Anderson"]
   # dependencies defined in Gemfile
   
   gem.files = Dir.glob( File.join( ".", "lib", "**", "*.rb" ) ) + 
               Dir.glob( File.join( ".", "test", "**", "*" ) ) +
               %w( Gemfile Rakefile LICENSE.txt README.rdoc VERSION CHANGELOG.markdown )  
 end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-desc "Code coverage detail"
-task :simplecov do
-  ENV['COVERAGE'] = "true"
-  Rake::Task['test'].execute
-end
-
-task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fun_with_gems #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+FunWith::Gems::Rakefile.setup_gem_boilerplate

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/fun_with/gems/fun_gem_api.rb

@@ -6,11 +6,17 @@ module FunWith
       end
       
       def validate_gem
-        FunWith::Gems::Validator.new( self ).validate
+        errors = FunWith::Gems::Validator.validate self
+        errors
       end
       
       def valid_gem?
-        self.validate_gem.fwf_blank?
+        errors = self.validate_gem
+        errors.fwf_blank?
+      end
+      
+      def passes_tests?
+        TestSuiteRunner.new( self ).passes_tests?
       end
       
       def gem_test_mode?
@@ -33,6 +39,38 @@ module FunWith
       def say_if_verbose( msg, stream = $stdout )
         stream.puts( msg ) if gem_verbose?
       end
+      
+      
+      def load_tasks
+        load_internal_tasks
+        load_external_tasks
+      end
+      
+      # Tasks in gem/tasks should be those which are specific to the gem itself.
+      # Tasks located here will not be made available to gems which depend on it.
+      # Made accessible during the Rakefile.setup
+      def load_internal_tasks
+        _load_tasks_from_directory self.root( "tasks" )
+      end
+      
+      # Tasks in gem/lib/tasks will be usable by gems which have this gem as a dependency.
+      def load_external_tasks
+        _load_tasks_from_directory self.root( "lib", "tasks" )
+      end
+      
+      def _load_tasks_from_directory dir
+        if _rake_gem_loaded?
+          dir.glob do |file|
+            if file.file? && ( file.ext == "rb" || file.ext == "rake" )
+              Rake.load_rakefile file
+            end
+          end
+        end
+      end
+      
+      def _rake_gem_loaded?
+        defined?( Gem ) && Gem.respond_to?( :loaded_specs ) && defined?( Rake ) && Gem.loaded_specs.keys.include?( "rake" )
+      end
     end
   end
 end

data/lib/fun_with/gems/gem_api.rb

@@ -25,6 +25,9 @@ module FunWith
         set_gem_root
         set_gem_version
         require_libs
+        extend_constant_with_gem_api
+        @gem_const.gem_verbose = opts[:verbose]
+        @gem_const.load_external_tasks  # Nothing happens unless 'rake' gem is active
       end
       
       protected
@@ -80,6 +83,12 @@ module FunWith
           end
         end
       end
+      
+      def extend_constant_with_gem_api
+        if defined?( @gem_const::GemAPI )
+          @gem_const.extend( @gem_const::GemAPI )
+        end
+      end
     end
   end
 end

data/lib/fun_with/gems/rake_class_methods.rb

@@ -0,0 +1,98 @@
+module FunWith
+  module Gems
+    module RakeClassMethods
+      attr_accessor :gem
+      
+      def setup this_gem, rake_main
+        set_gem        this_gem
+        set_rake_main  rake_main
+        run_bundler_setup
+        
+        # Internal tasks are set up in the Rakefile.  
+        # External tasks (visible to the gems that depend on your fungem) are setup during the normal gem setup, if the 'rake' gem is present.
+        get_gem.load_internal_tasks     
+      end
+      
+      def set_gem g
+        @gem = g
+      end
+      
+      def get_gem
+        @gem
+      end
+      
+      def set_rake_main m
+        @rake_main = m
+      end
+      
+      def run_bundler_setup
+        jeweler_requirements
+        rake_requirements
+        
+        begin
+          Bundler.setup(:default, :development)
+        rescue Bundler::BundlerError => e
+          $stderr.puts e.message
+          $stderr.puts "Run `bundle install` to install missing gems"
+          exit e.status_code
+        end
+      end
+      
+      def specification &block
+        Jeweler::Tasks.new do |gem|
+          yield gem
+        end
+      end
+      
+      def setup_gem_boilerplate
+        run_in_rakefile do
+          Jeweler::RubygemsDotOrgTasks.new
+
+          Rake::TestTask.new(:test) do |test|
+            test.libs << 'lib' << 'test'
+            test.pattern = 'test/**/test_*.rb'
+            test.verbose = true
+          end
+
+          desc "Code coverage detail"
+          task :simplecov do
+            ENV['COVERAGE'] = "true"
+            Rake::Task['test'].execute
+          end
+
+          task :default => :test
+
+          Rake::RDocTask.new do |rdoc|
+            version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+            rdoc.rdoc_dir = 'rdoc'
+            rdoc.title = "fun_with_gems #{version}"
+            rdoc.rdoc_files.include('README*')
+            rdoc.rdoc_files.include('lib/**/*.rb')
+          end
+        end
+      end
+      
+      def jeweler_requirements
+        require 'rake'
+        require 'jeweler'
+      end
+      
+      def rake_requirements
+        require 'rdoc/task'
+        require 'rake/testtask'
+      end
+      
+      def run_in_rakefile &block
+        if @rake_main.nil?
+          raise "Did you forget the line FunWith::Gems::Rakefile.set_rake_main by any chance?"
+        elsif ! block_given?
+          raise ArgumentError.new("Block must be given")
+        else
+          @rake_main.instance_eval &block
+        end
+      end
+    end
+  end
+end
+

data/lib/fun_with/gems/rakefile.rb

@@ -0,0 +1,6 @@
+module FunWith
+  module Gems
+    module Rakefile
+    end
+  end
+end

data/lib/fun_with/gems/test_results.rb

@@ -0,0 +1,38 @@
+module FunWith
+  module Gems
+    class TestResults
+      TEST_SUITE_DATA_REGEX = /(?<tests>\d+) (?:tests|runs), (?<assertions>\d+) assertions, (?<failures>\d+) failures, (?<errors>\d+) errors, (?<skips>\d+) skips/
+      
+      attr_accessor :output, :test_results_found, :gem_const, :fail_count
+      
+      def initialize g
+        self.gem_const = g
+      end
+      
+      def passed?
+        self.scan_test_results
+        self.test_results_found? && no_failures_or_errors?
+      end
+      
+      def test_results_found?
+        self.test_results_found
+      end
+      
+      def no_failures_or_errors?
+        fail_count == 0
+      end
+      
+      def scan_test_results
+        raise "No output to scan!" if self.output.nil?
+        
+        if m = self.output.match( TEST_SUITE_DATA_REGEX )
+          self.test_results_found = true
+          self.fail_count = m[:failures].to_i + m[:errors].to_i
+        else
+          self.fail_count = -1
+          self.test_results_found = false
+        end
+      end
+    end
+  end
+end

data/lib/fun_with/gems/test_suite_runner.rb

@@ -0,0 +1,26 @@
+module FunWith
+  module Gems
+    class TestSuiteRunner
+      attr_accessor :gem_const
+      
+      def initialize fwgem
+        self.gem_const = fwgem
+      end
+      
+      def passes_tests?
+        result = self.run_tests
+        result.passed?
+      end
+      
+      def run_tests
+        filepath = self.gem_const.root
+        
+        results = TestResults.new( self.gem_const )
+        
+        puts "running tests on #{self.gem_const} from #{filepath}"
+        results.output = `cd #{filepath} && rake test`
+        results
+      end
+    end
+  end
+end

data/lib/fun_with/gems/validator.rb

@@ -1,8 +1,6 @@
 module FunWith
   module Gems
     class Validator
-      TEST_SUITE_DATA_REGEX = /(<?tests>\d+) tests, (<?assertions>\d+) assertions, (<?failures>\d+) failures, (<?errors>\d+) errors, (<?skips>\d+) skips/
-
       def self.validate( gem_const )
         self.new( gem_const ).validate
       end
@@ -28,9 +26,7 @@ module FunWith
           @fun_gem_errors << "doesn't respond to .root()"
         end
         
-        if @gem_const.respond_to?(:version)
-          
-        else
+        if ! @gem_const.respond_to?(:version)
           @fun_gem_errors << "doesn't respond to .version()"
         end
         
@@ -41,21 +37,6 @@ module FunWith
         @fun_gem_errors
       end
       
-      
-      def passes_tests?( filepath )
-        @test_output = `cd #{filepath} && rake`
-        results = scan_results( @test_output )
-      end
-      
-      def scan_results( str )
-        if m = str.match( TEST_SUITE_DATA_REGEX )
-          m[0]
-        else
-          "TEST STATS NOT FOUND"
-        end
-      end
-      
-      
       def git_up_to_date?( filepath )
         # On branch master
         #         Your branch is ahead of 'origin/master' by 1 commit.

data/lib/fun_with_gems.rb

@@ -1,6 +1,9 @@
 require "fun_with_version_strings"
 require "fun_with_files"
 
+# require 'debugger'
+# debugger
+
 # FunWith::VersionStrings.versionize( FunWith::Files )
 
 lib_dir = __FILE__.fwf_filepath.dirname
@@ -16,5 +19,7 @@ FunWith::Gems.extend( FunWith::Gems::GemAPI )
 # rootifies
 # requir's the lib/fun_with directory
 # Do this because FunWithFiles doesn't do it itself.  
-FunWith::Gems.make_gem_fun( FunWith::Files, :require => false, :set_root => false, :set_version => false )
-FunWith::Gems.make_gem_fun( "FunWith::Gems" )
+FunWith::Gems.make_gem_fun FunWith::Files, :require => false, :set_root => false, :set_version => false
+FunWith::Gems.make_gem_fun FunWith::Gems, :verbose => true
+
+FunWith::Gems::Rakefile.extend FunWith::Gems::RakeClassMethods 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_gems
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bryce Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fun_with_files
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.13
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.13
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
@@ -76,7 +76,10 @@ files:
 - ./lib/fun_with/gems/core_extensions/module.rb
 - ./lib/fun_with/gems/fun_gem_api.rb
 - ./lib/fun_with/gems/gem_api.rb
-- ./lib/fun_with/gems/mechanic.rb
+- ./lib/fun_with/gems/rake_class_methods.rb
+- ./lib/fun_with/gems/rakefile.rb
+- ./lib/fun_with/gems/test_results.rb
+- ./lib/fun_with/gems/test_suite_runner.rb
 - ./lib/fun_with/gems/validator.rb
 - ./lib/fun_with_gems.rb
 - ./test/helper.rb

data/lib/fun_with/gems/mechanic.rb

@@ -1,27 +0,0 @@
-module FunWith
-  module Gems
-    
-    class Mechanic
-      def bump_version( gem_const )
-        if Validator.new.validate( gem_const )
-        # if tests pass and gem is valid
-        
-          # run rake version:bump:patch
-        
-          # git commit
-        
-          # git push
-        
-          # add branch v<VERSION>
-        
-          # rake install
-        
-          # gem push
-        
-        else
-          puts "Failed"
-        end
-      end
-    end
-  end
-end