buildar 1.2.0.1 → 1.3.0.7

data/MANIFEST.txt

@@ -1,3 +1,4 @@
+buildar.gemspec
 MANIFEST.txt
 VERSION
 rakefile.rb

data/VERSION

@@ -1 +1 @@
-1.2.0.1
+1.3.0.7

data/buildar.gemspec

@@ -0,0 +1,22 @@
+Gem::Specification.new do |s|
+  # static stuff
+  s.name     = 'buildar'
+  s.summary  = 'Buildar crept inside your rakefile and scratched upon the tasking post'
+  s.author   = 'Rick Hull'
+  s.homepage = 'https://github.com/rickhull/buildar'
+  s.license  = 'MIT'
+  s.has_rdoc = true
+  s.description = 'Buildar helps automate the release process with versioning, building, packaging, and publishing.  Optional git integration.'
+
+  s.add_runtime_dependency        "rake", ">= 8" # guess?
+  s.add_development_dependency "buildar", "~> 1.0"
+
+  # dynamic setup
+  this_dir = File.dirname(File.expand_path(__FILE__))
+  version_file = File.join(this_dir, 'VERSION')
+  manifest_file = File.join(this_dir, 'MANIFEST.txt')
+
+  # dynamic assignments
+  s.version  = File.read(version_file).chomp
+  s.files = File.readlines(manifest_file).map { |f| f.chomp }
+end

data/lib/buildar.rb

@@ -7,9 +7,12 @@
 # And it can't be set to nil, for example.
 #
 class Buildar
+  def self.dir(file)
+    File.expand_path('..', file)
+  end
+
   def self.version
-    vpath = File.join(File.dirname(__FILE__), '..', 'VERSION')
-    File.read(vpath).chomp
+    File.read(File.join(dir(__FILE__), '..', 'VERSION')).chomp
   end
 
   # Call this from the rakefile, like:
@@ -58,62 +61,59 @@ class Buildar
     }.join('.')
   end
 
-  attr_accessor :root, :name, :version_filename, :manifest_filename,
-                :use_git, :publish, :use_manifest_file, :use_version_file
+  attr_accessor :root, :name,
+                :use_git, :publish,
+                :use_gemspec_file, :gemspec_filename,
+                :use_version_file, :version_filename,
+                :use_manifest_file, :manifest_filename
+
+  attr_writer :gemspec_filename
 
-  def initialize(root = nil, name = nil)
+  def initialize(root = nil)
     @root = root ? File.expand_path(root) : Dir.pwd
-    @name = name || File.split(@root).last
+    @name = File.split(@root).last
+    @use_git = false
+    @publish = { rubygems: false }
+    @use_gemspec_file = true
     @use_version_file = false
     @version_filename = 'VERSION'
     @use_manifest_file = false
     @manifest_filename = 'MANIFEST.txt'
-    @use_git = false
-    @publish = { rubygems: false }
   end
 
-  # created on demand and kept up to date
-  #
   def gemspec
-    @gemspec ||= Gem::Specification.new
-    @gemspec.name = @name
-    @gemspec.files = self.manifest if @use_manifest_file
-    @gemspec.version = self.version if @use_version_file
-    @gemspec
+    @use_gemspec_file ? self.hard_gemspec : self.soft_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
+  def soft_gemspec
+    @soft_gemspec ||= Gem::Specification.new
+    @soft_gemspec.name = @name
+    @soft_gemspec.version = self.version if @use_version_file
+    @soft_gemspec.files = self.manifest if @use_manifest_file
+    @soft_gemspec
   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
+  # load every time; cache locally if you must
+  #
+  def hard_gemspec
+    Gem::Specification.load self.gemspec_file
   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
+  def gemspec_file
+    File.join(@root, self.gemspec_filename)
   end
 
-  def version_file
-    File.join(@root, @version_filename)
+  # @name.gemspec is the default, but don't set this in the constructor
+  # it's common to set the name after intialization.  e.g. via Buildar.conf
+  # so set the default on first invocation.  After that, it's an accessor.
+  #
+  def gemspec_filename
+    @gemspec_filename ||= "#{@name}.gemspec"
+    @gemspec_filename
+  end
+
+  def gemspec_location
+    @use_gemspec_file ? self.gemspec_filename : 'Rakefile'
   end
 
   def version
@@ -124,11 +124,45 @@ class Buildar
     File.open(self.version_file, 'w') { |f| f.write(new_version) }
   end
 
-  def manifest_file
-    File.join(@root, @manifest_filename)
+  def version_file
+    File.join(@root, @version_filename)
+  end
+
+  def available_version
+    return self.version if @use_version_file
+    version = self.gemspec.version
+    raise "gemspec.version is missing" if !version or version.to_s.empty?
+    version
+  end
+
+  def version_location
+    @use_version_file ? self.version_filename : self.gemspec_filename
+  end
+
+  # where we expect a built gem to land
+  #
+  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_manifest
+    return self.manifest if @use_manifest_file
+    manifest = self.gemspec.files
+    raise "gemspec.files is missing" if !manifest or manifest.to_s.empty?
+    manifest
   end
 
   def manifest
     File.readlines(self.manifest_file).map { |line| line.chomp }
   end
+
+  def manifest_file
+    File.join(@root, @manifest_filename)
+  end
+
+  def manifest_location
+    @use_manifest_file ? self.manifest_filename : self.gemspec_filename
+  end
 end

data/lib/buildar/tasks.rb

@@ -7,6 +7,28 @@ def proj
   Buildar.instance
 end
 
+# dump environment stuff, smoketest
+#
+task :buildar do
+  puts
+  puts <<EOF
+          Project: #{proj.name} #{proj.version}
+             Root: #{proj.root}
+ Use gemspec file: #{proj.use_gemspec_file}
+ Use version file: #{proj.use_version_file}
+Use manifest file: #{proj.use_manifest_file}
+          Use git: #{proj.use_git}
+          Publish: #{proj.publish.keys}
+ Gemspec location: #{proj.gemspec_location}
+ Version location: #{proj.version_location}
+Manifest location: #{proj.manifest_location}
+----
+using Buildar #{Buildar.version}
+EOF
+  puts
+end
+
+
 # the reason you're here
 #
 task :release => [:message, :build, :tag, :publish]
@@ -29,18 +51,33 @@ end
 # roughly equivalent to `gem build foo.gemspec`
 # places .gem file in pkg/
 #
-task :build => [:test, :bump_build] do
+task :package => [:test, :bump_build] do
   # definine the task at runtime, rather than requiretime
   # so that the gemspec will reflect any version bumping since requiretime
   Gem::PackageTask.new(proj.gemspec).define
   Rake::Task["package"].invoke
 end
 
+task :build => [:test, :bump_build] do
+  if proj.use_gemspec_file
+    sh "gem build #{proj.gemspec_filename}"
+    target_file = "#{proj.name}-#{proj.available_version}.gem"
+    if File.exists? target_file
+      sh "mv #{target_file} pkg/#{target_file}"
+    else
+      puts "warning: expected #{target_file} but didn't find it"
+    end
+  else
+    puts "warning: cannot build without use_gemspec_file; try package"
+  end
+end
+
 task :install => [:build] do
   sh "gem uninstall #{proj.name}"
   sh "gem install #{proj.gemfile}"
 end
 
+# if proj.use_version_file
 # tasks :bump_major, :bump_minor, :bump_patch, :bump_build
 # commit the version file if proj.use_git
 #

data/rakefile.rb

@@ -2,21 +2,23 @@ require 'buildar/tasks'
 require 'rake/testtask'
 
 Buildar.conf(__FILE__) do |b|
+  b.name = 'buildar'
   b.use_version_file  = true
   b.version_filename  = 'VERSION'
   b.use_manifest_file = true
   b.manifest_filename = 'MANIFEST.txt'
   b.use_git           = true
   b.publish[:rubygems] =  true
-  b.gemspec.name     = 'buildar'
-  b.gemspec.summary  = 'Buildar crept inside your rakefile and scratched upon the tasking post'
-  b.gemspec.author   = 'Rick Hull'
-  b.gemspec.homepage = 'https://github.com/rickhull/buildar'
-  b.gemspec.license  = 'MIT'
-  b.gemspec.has_rdoc = true
-  b.gemspec.description = 'Buildar helps automate the release process with versioning, building, packaging, and publishing.  Optional git integration.'
-  b.gemspec.add_runtime_dependency        "rake", ">= 8" # guess?
-  b.gemspec.add_development_dependency "buildar", "~> 1.0"
+
+#  b.gemspec.summary  = 'Buildar crept inside your rakefile and scratched upon the tasking post'
+#  b.gemspec.author   = 'Rick Hull'
+#  b.gemspec.homepage = 'https://github.com/rickhull/buildar'
+#  b.gemspec.license  = 'MIT'
+#  b.gemspec.has_rdoc = true
+#  b.gemspec.description = 'Buildar helps automate the release process with versioning, building, packaging, and publishing.  Optional git integration.'
+
+#  b.gemspec.add_runtime_dependency        "rake", ">= 8" # guess?
+#  b.gemspec.add_development_dependency "buildar", "~> 1.0"
 end
 
 Rake::TestTask.new :test do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildar
 version: !ruby/object:Gem::Version
-  version: 1.2.0.1
+  version: 1.3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,6 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- buildar.gemspec
 - MANIFEST.txt
 - VERSION
 - rakefile.rb