technicalpickles-jeweler 0.0.3 → 0.0.4

data/lib/jeweler/active_support.rb

@@ -34,5 +34,5 @@ class Jeweler
     end
   end
   
-  extend ActiveSupport
+  include ActiveSupport
 end

data/lib/jeweler/tasks.rb

@@ -1,37 +1,49 @@
 desc "Generate a gemspec file for GitHub"
 task :gemspec do
-  Jeweler.write_gemspec
+  Jeweler.instance.write_gemspec
 end
 
 desc "Displays the current version"
 task :version do
-  puts Jeweler.version
+  puts Jeweler.instance.version
 end
 
 namespace :version do
   namespace :bump do
     desc "Bump the gemspec a major version."
     task :major do
-      major = Jeweler.major_version + 1
-      Jeweler.bump_version(major, 0, 0)
-      Jeweler.write_gemspec
+      jeweler = Jeweler.instance
+      
+      major = jeweler.major_version + 1
+      
+      jeweler.bump_version(major, 0, 0)
+      jeweler.write_gemspec
+      
       puts "Version bumped to #{Jeweler.version}"
     end
     
     desc "Bump the gemspec a minor version."
     task :minor do
-      minor = Jeweler.minor_version + 1
-      Jeweler.bump_version(Jeweler.major_version, minor, 0)
-      Jeweler.write_gemspec
-      puts "Version bumped to #{Jeweler.version}"
+      jeweler = Jeweler.instance
+      
+      minor = jeweler.minor_version + 1
+      
+      jeweler.bump_version(jeweler.major_version, minor, 0)
+      jeweler.write_gemspec
+      
+      puts "Version bumped to #{jeweler.version}"
     end
     
     desc "Bump the gemspec a patch version."
     task :patch do
-      patch = Jeweler.patch_version + 1
-      Jeweler.bump_version(Jeweler.major_version, Jeweler.minor_version, patch)
-      Jeweler.write_gemspec
-      puts "Version bumped to #{Jeweler.version}"
+      jeweler = Jeweler.instance
+      
+      patch = jeweler.patch_version + 1
+      
+      jeweler.bump_version(jeweler.major_version, jeweler.minor_version, patch)
+      jeweler.write_gemspec
+      
+      puts "Version bumped to #{jeweler.version}"
     end
   end
 end

data/lib/jeweler/version.rb

@@ -2,6 +2,6 @@ class Jeweler
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
   end
 end

data/lib/jeweler.rb

@@ -2,43 +2,47 @@ require 'date'
 
 class Jeweler
   def self.gemspec=(gemspec)
-    @@gemspec = gemspec
-    load version_module_path
-    @@gemspec.version = version
-    @@gemspec.files ||= FileList["[A-Z]*", "{generators,lib,test,spec}/**/*"]
+    @@instance = new(gemspec)
+  end
+  
+  def self.instance
+    @@instance
+  end
+  
+  attr_reader :gemspec
+  def initialize(gemspec)
+    @gemspec = gemspec
+    
+    load_version()
+    
+    @gemspec.version = version
+    @gemspec.files ||= FileList["[A-Z]*", "{generators,lib,test,spec}/**/*"]
   end
   
-  def self.major_version
+  def major_version
     version_module.const_get(:MAJOR)
   end
   
-  def self.minor_version
+  def minor_version
     version_module.const_get(:MINOR)
   end
   
-  def self.patch_version
+  def patch_version
     version_module.const_get(:PATCH)
   end
   
-  def self.version
+  def version
     "#{major_version}.#{minor_version}.#{patch_version}"
   end
   
-  def self.date
+  def date
     date = DateTime.now
     "#{date.year}-#{date.month}-#{date.day}"
   end
     
-  def self.bump_version(major, minor, patch)
+  def bump_version(major, minor, patch)
     main_module_or_class = constantize(main_module_name)
-    keyword = case main_module_or_class.class
-    when Class
-      'class'
-    when Module
-      'module'
-    else
-      raise "Uh, main_module_name should be a class or module, but was a #{main_module_or_class.class}"
-    end
+    keyword = top_level_keyword
     
     File.open(version_module_path, 'w') do |file|
       file.write <<-END
@@ -51,46 +55,62 @@ class Jeweler
 end
       END
     end
-    @@gemspec.version = "#{major}.#{minor}.#{patch}"
+    @gemspec.version = "#{major}.#{minor}.#{patch}"
     refresh_version
   end
   
-  def self.write_gemspec
-    @@gemspec.date = self.date
+  def write_gemspec
+    @gemspec.date = self.date
     File.open(gemspec_path, 'w') do |f|
-      f.write @@gemspec.to_ruby
+      f.write @gemspec.to_ruby
     end
   end
   
   private
   
-  def self.gemspec_path
-    "#{@@gemspec.name}.gemspec"
+  def top_level_keyword
+    main_module_or_class = constantize(main_module_name)
+    case main_module_or_class
+    when Class
+      'class'
+    when Module
+      'module'
+    else
+      raise "Uh, main_module_name should be a class or module, but was a #{main_module_or_class.class}"
+    end
+  end
+  
+  def gemspec_path
+    "#{@gemspec.name}.gemspec"
   end
   
-  def self.version_module_path
-    "lib/#{@@gemspec.name}/version.rb"
+  def version_module_path
+    "lib/#{@gemspec.name}/version.rb"
   end
   
-  def self.version_module
+  def version_module
     constantize("#{main_module_name}::Version")
   end
   
-  def self.main_module_name
-    camelize(@@gemspec.name)
+  def main_module_name
+    camelize(@gemspec.name)
   end
   
-  def self.refresh_version
+  def refresh_version
     # Remove the constants, so we can reload the version_module
     version_module.module_eval do
-      remove_const(:MAJOR)
-      remove_const(:MINOR)
-      remove_const(:PATCH)
+      remove_const(:MAJOR) if const_defined?(:MAJOR)
+      remove_const(:MINOR) if const_defined?(:MINOR)
+      remove_const(:PATCH) if const_defined?(:PATCH)
     end
+    load_version
+  end
+  
+  def load_version
     load version_module_path
   end
 end
 
 require 'jeweler/active_support' # Adds the stolen camelize and constantize
 
-require 'jeweler/tasks'
+require 'jeweler/tasks' if defined?(Rake)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Josh Nichols