buildar 1.3.0.7 → 1.4.0.1

data/VERSION

@@ -1 +1 @@
-1.3.0.7
+1.4.0.1

data/lib/buildar.rb

@@ -64,8 +64,7 @@ class Buildar
   attr_accessor :root, :name,
                 :use_git, :publish,
                 :use_gemspec_file, :gemspec_filename,
-                :use_version_file, :version_filename,
-                :use_manifest_file, :manifest_filename
+                :use_version_file, :version_filename
 
   attr_writer :gemspec_filename
 
@@ -77,8 +76,6 @@ class Buildar
     @use_gemspec_file = true
     @use_version_file = false
     @version_filename = 'VERSION'
-    @use_manifest_file = false
-    @manifest_filename = 'MANIFEST.txt'
   end
 
   def gemspec
@@ -89,7 +86,6 @@ class Buildar
     @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
 
@@ -146,23 +142,4 @@ class Buildar
     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,28 +7,6 @@ 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]
@@ -48,16 +26,20 @@ task :message do
   end
 end
 
+# uses Gem::PackageTask to build via Gem API
 # roughly equivalent to `gem build foo.gemspec`
-# places .gem file in pkg/
+# operates with a hard or soft gemspec
 #
-task :package => [:test, :bump_build] do
+task :gem_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
 
+# if proj.use_gemspec_file
+# exactly equiavlent to `gem build #{proj.gemspec_filename}`
+#
 task :build => [:test, :bump_build] do
   if proj.use_gemspec_file
     sh "gem build #{proj.gemspec_filename}"
@@ -68,7 +50,7 @@ task :build => [:test, :bump_build] do
       puts "warning: expected #{target_file} but didn't find it"
     end
   else
-    puts "warning: cannot build without use_gemspec_file; try package"
+    Rake::Task[:gem_package].invoke
   end
 end
 
@@ -134,12 +116,24 @@ task :version do
   puts "#{proj.name} #{proj.available_version}"
 end
 
-# display files tracked by the gem
+# if the user wants a bump, make it a patch; not used internally
 #
-task :manifest do
-  puts proj.available_manifest.join("\n")
-end
+task :bump => [:bump_patch]
 
-# if the user wants a bump, make it a patch
+# config check
 #
-task :bump => [:bump_patch]
+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 git: #{proj.use_git}
+          Publish: #{proj.publish.keys}
+   Gemspec source: #{proj.gemspec_location}
+   Version source: #{proj.version_location}
+# using Buildar #{Buildar.version}
+EOF
+  puts
+end

data/rakefile.rb

@@ -5,20 +5,8 @@ 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.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.publish[:rubygems] = true
 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.3.0.7
+  version: 1.4.0.1
   prerelease: 
 platform: ruby
 authors: