ruby_ext 0.4.13 → 0.4.14

data/Rakefile

@@ -5,7 +5,8 @@ require 'rake_ext'
 
 project(
   name: "ruby_ext",
-  version: "0.4.13",
+  gem: true,
+  # version: "0.4.13",
   summary: "Ruby Extensions",
 
   author: "Alexey Petrushin",

data/lib/rake_ext/project.rb

@@ -58,46 +58,74 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'tmpdir'
 
-namespace :gem do
-  spec = Gem::Specification.new do |s|
-    gems, fake_gems = parse_project_gemfile
-    gems = gems + fake_gems
+class GemHelper
+  class << self
+    def next_version gem_name
+      %x(gem list --remote #{gem_name}).scan /#{gem_name} \((\d+\.\d+\.\d+)\)/ do |s|
+        v = s.first.split('.').collect{|d| d.to_i}
+        v[-1] = v[-1] + 1
+        return v.join('.')
+      end
+      return '0.0.1'
+    end
     
-    gems.each{|name_version| s.add_dependency *name_version}
+    def prepare_gem_metadata
+      spec = Gem::Specification.new do |s|
+        gems, fake_gems = parse_project_gemfile
+        gems = gems + fake_gems
 
-    options = project.clone
+        gems.each{|name_version| s.add_dependency *name_version}
 
-    options.delete(:name)
-    s.name = options.delete(:official_name)
-    s.platform = options.delete(:platform) || Gem::Platform::RUBY
-    s.has_rdoc = options.delete(:has_rdoc) == nil ? false : true
-    s.require_path = options.delete(:lib) || "lib"
-    s.files = options.delete(:files) || (%w{Rakefile readme.md} + Dir.glob("{lib,spec}/**/*"))
-    s.bindir = options.delete(:bin) if options.include? :bin
+        options = project.clone
 
-    # s.name = options[:name)
-    # s.author = options[:author)
-    # s.homepage = options[:homepage)
+        options.delete(:name)
+        options.delete(:gem) || raise("this project isn't a gem!")
+        name = options.delete(:official_name)
 
-    options.each{|k, v| s.send "#{k}=", v}    
-  end
+        s.name = name
+        s.platform = options.delete(:platform) || Gem::Platform::RUBY
+        s.has_rdoc = options.delete(:has_rdoc) == nil ? false : true
+        s.require_path = options.delete(:lib) || "lib"
+        s.files = options.delete(:files) || (%w{Rakefile readme.md} + Dir.glob("{lib,spec}/**/*"))
+        s.bindir = options.delete(:bin) if options.include? :bin
+
+        s.version = options.delete(:version) || GemHelper.next_version(name)
+
+        # s.name = options[:name)
+        # s.author = options[:author)
+        # s.homepage = options[:homepage)
+
+        options.each{|k, v| s.send "#{k}=", v}    
+      end
 
-  package_dir = Dir.tmpdir + "/#{project[:official_name]}_tmp"
-  Rake::GemPackageTask.new(spec) do |p|
-    p.need_tar = true if RUBY_PLATFORM !~ /mswin/
-    p.need_zip = true
-    p.package_dir = package_dir
+      Rake::GemPackageTask.new(spec) do |p|
+        p.need_tar = true if RUBY_PLATFORM !~ /mswin/
+        p.need_zip = true
+        p.package_dir = package_dir
+      end
+    end
+    
+    def package_dir
+      Dir.tmpdir + "/#{project[:official_name]}_tmp"
+    end
   end
+end
 
-  task :push do
-    gem_file = Dir.glob("#{package_dir}/#{project[:official_name]}*.gem").first
+namespace :gem do
+  task :ensure_gem do
+    GemHelper.prepare_gem_metadata
+  end
+  
+  task push: :ensure_gem do    
+    gem_file = Dir.glob("#{GemHelper.package_dir}/#{project[:official_name]}*.gem").first
     system "gem push #{gem_file}"
   end
 
-  task :clean do
-    system "rm -r #{package_dir}"
+  task clean: :ensure_gem do
+    GemHelper.prepare_gem_metadata
+    system "rm -r #{GemHelper.package_dir}"
   end
   
-  desc "Build and publish project as gem"
-  task release: [:gem, :push, :clean]
+  desc "Build and publish project as gem"  
+  task release: [:ensure_gem, :gem, :push, :clean]
 end

data/lib/rake_ext.rb

@@ -26,8 +26,7 @@ begin
     t.pattern = "spec/**/[^_]*_spec.rb"
   end
   
-  namespace :spec do
-    
+  namespace :spec do    
     desc "Run RSpec code exapmples in isolated mode (every spec file in another Ruby process)"
     task :isolated do
       Dir.glob("spec/[^_]**/[^_]*_spec.rb").each do |spec_file|
@@ -44,12 +43,12 @@ end
 # 
 # project_dir
 # 
-PROJECT_DIR = (
+$_project_dir = (
   caller.find{|line| line =~ /\/Rakefile\:/} || 
   raise("You can include the 'rake_ext' only in Rakefile!")
 ).sub(/\/Rakefile\:.*/, '')
 def project_dir
-  PROJECT_DIR
+  $_project_dir
 end
 
 
@@ -57,14 +56,14 @@ end
 # before, after and remove task
 # 
 def before task_name, &block
-  @task_counter ||= {}
-  counter = (@task_counter[task_name] ||= 0)
+  $_task_counter ||= {}
+  counter = ($_task_counter[task_name] ||= 0)
   before_task_name = "#{task_name}_before_#{counter}"
   
   task before_task_name, &block
   task task_name => before_task_name
   
-  @task_counter[task_name] += 1
+  $_task_counter[task_name] += 1
 end
 
 def after task_name, &block
@@ -82,13 +81,13 @@ alias :delete_task :remove_task
 # 
 def project options = nil  
   if options
-    @options = {}
-    options.each{|k, v| @options[k.to_sym] = v}
+    $_project = {}
+    options.each{|k, v| $_project[k.to_sym] = v}
     
-    @options[:name] || raise("project name not defined")
-    @options[:official_name] ||= @options[:name]
+    $_project[:name] || raise("project name not defined")
+    $_project[:official_name] ||= $_project[:name]
     
     require 'rake_ext/project'
   end
-  @options || raise("project not defined!")
+  $_project || raise("project not defined!")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ext
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-02 00:00:00.000000000 +04:00
+date: 2011-07-04 00:00:00.000000000 +04:00
 default_executable: 
 dependencies: []
 description: