buildar 1.0.1.1 → 1.0.2.1

data/VERSION

@@ -1 +1 @@
-1.0.1.1
+1.0.2.1

data/lib/buildar.rb

@@ -53,13 +53,14 @@ class Buildar
   end
 
   attr_accessor :root, :name, :version_filename, :manifest_filename,
-                :use_git, :publish, :use_manifest_file
+                :use_git, :publish, :use_manifest_file, :use_version_file
 
   def initialize(root = nil, name = nil)
     @root = root ? File.expand_path(root) : Dir.pwd
     @name = name || File.split(@root).last
+    @use_version_file = false
     @version_filename = 'VERSION'
-    @use_manifest_file = true
+    @use_manifest_file = false
     @manifest_filename = 'MANIFEST.txt'
     @use_git = true
     @publish = { rubygems: true }
@@ -86,10 +87,40 @@ class Buildar
     # Make sure things tracked elsewhere stay updated
     @gemspec.name = @name
     @gemspec.files = self.manifest if @use_manifest_file
-    @gemspec.version = self.version
+    @gemspec.version = self.version if @use_version_file
     @gemspec
   end
 
+  def gemfile
+    path = File.join(@root, 'pkg', "#{@name}-#{self.available_version}.gem")
+    raise "gemfile #{path} does not exist" unless File.exists?(path)
+    path
+  end
+
+  def available_version
+    if @use_version_file
+      self.version
+    elsif !@gemspec.version
+      raise "gemspec.version is false or nil"
+    elsif @gemspec.version.to_s.empty?
+      raise "gemspec.version is empty"
+    else
+      @gemspec.version
+    end
+  end
+
+  def available_manifest
+    if @use_manifest_file
+      self.manifest
+    elsif !@gemspec.files
+      raise "gemspec.files is false or nil"
+    elsif @gemspec.files.empty?
+      raise "gemspec.files is empty"
+    else
+      @gemspec.files
+    end
+  end
+
   def version_file
     File.join(@root, @version_filename)
   end

data/lib/buildar/tasks.rb

@@ -36,18 +36,25 @@ task :build => [:test, :bump_build] do
   Rake::Task["package"].invoke
 end
 
+task :install => [:build] do
+  sh "gem uninstall #{proj.name}"
+  sh "gem install #{proj.gemfile}"
+end
+
 # tasks :bump_major, :bump_minor, :bump_patch, :bump_build
 # commit the version file if proj.use_git
 #
 [:major, :minor, :patch, :build].each { |v|
   task "bump_#{v}" do
-    old_version = proj.version
-    new_version = Buildar.bump(v, old_version)
-    puts "bumping #{old_version} to #{new_version}"
-    proj.write_version new_version
-    if proj.use_git
-      msg = "rake bump_#{v} to #{new_version}"
-      sh "git commit #{proj.version_file} -m '#{msg}'"
+    if proj.use_version_file
+      old_version = proj.version
+      new_version = Buildar.bump(v, old_version)
+      puts "bumping #{old_version} to #{new_version}"
+      proj.write_version new_version
+      if proj.use_git
+        msg = "rake bump_#{v} to #{new_version}"
+        sh "git commit #{proj.version_file} -m '#{msg}'"
+      end
     end
   end
 }
@@ -58,7 +65,7 @@ end
 #
 task :tag => [:test] do
   if proj.use_git
-    tagname = "v#{proj.version}"
+    tagname = "v#{proj.available_version}"
     message = ENV['message'] || "auto-tagged #{tagname} by Rake"
     sh "git tag -a '#{tagname}' -m '#{message}'"
     sh "git push origin --tags"
@@ -69,22 +76,7 @@ end
 # roughly, gem push foo-VERSION.gem
 #
 task :publish => [:verify_publish_credentials] do
-  if proj.publish[:rubygems]
-    fragment = "-#{proj.version}.gem"
-    pkg_dir = File.join(proj.root, 'pkg')
-    Dir.chdir(pkg_dir) {
-      candidates = Dir.glob "*#{fragment}"
-      # sanity check
-      case candidates.length
-      when 0
-        raise "could not find .gem matching #{fragment}"
-      when 1
-        sh "gem push #{candidates.first}"
-      else
-        raise "multiple candidates found matching #{fragment}"
-      end
-    }
-  end
+  sh "gem push #{proj.gemfile}" if proj.publish[:rubygems]
 end
 
 # if proj.publish[:rubygems]
@@ -102,21 +94,13 @@ end
 # display project name and version
 #
 task :version do
-  puts "#{proj.name} #{proj.version}"
+  puts "#{proj.name} #{proj.available_version}"
 end
 
-# display Buildar's understanding of the files inside the gem
+# display files tracked by the gem
 #
 task :manifest do
-  if proj.use_manifest_file
-    puts proj.manifest.join("\n")
-  elsif !proj.gemspec.files
-    puts "warning: gemspec.files is false or nil"
-  elsif proj.gemspec.files.empty?
-    puts "warning: gemspec.files is empty"
-  else
-    puts proj.gemspec.files.join("\n")
-  end
+  puts proj.available_manifest.join("\n")
 end
 
 # if the user wants a bump, make it a patch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildar
 version: !ruby/object:Gem::Version
-  version: 1.0.1.1
+  version: 1.0.2.1
   prerelease: 
 platform: ruby
 authors: