metarake 0.1.0 → 0.1.1

data/examples/Rakefile.fpm_and_freight

@@ -0,0 +1,21 @@
+# -*- ruby -*-
+
+# Use Rake inside subproject directories to build .deb packages, and
+# freight (https://github.com/rcrowley/freight/) to publish them as an
+# apt repository.
+
+require 'metarake'
+require 'metarake/publisher/freight'
+
+class PackagesMetaTask < MetaRake::Task
+  include MetaRake::Builder::Rake
+  include MetaRake::Publisher::Freight
+
+  self.target_filter = /\.deb$/
+  self.rake_command = 'fakeroot bundle exec rake'
+  self.freight_distro = ENV['FREIGHT_DISTRO'] || 'squeeze'
+  self.freight_conf_path = ENV['FREIGHT_CONF'] || 'freight.conf'
+  self.freight_command = ENV['FREIGHT_COMMAND'] || 'freight'
+end
+
+task :default => PackagesMetaTask.discover!

data/lib/metarake/builder/rake.rb

@@ -11,9 +11,13 @@ module MetaRake::Builder::Rake
     # @see Metarake::Builder::Rake#project_target?
     attr_accessor :target_filter
 
+    # Glob to find projects' Rakefiles (default: `['*/Rakefile']`)
+    attr_accessor :rakefile_glob
+
     # Projects are subdirectories that have a Rakefile.
     def projects
-      Dir['*/Rakefile'].map { |rakefile| File.dirname(rakefile) }
+      glob = rakefile_glob || ['*/Rakefile']
+      Dir[*glob].map { |rakefile| File.dirname(rakefile) }
     end
   end
 
@@ -43,9 +47,9 @@ module MetaRake::Builder::Rake
   def project_target?(target_name)
     case self.class.target_filter
     when nil    ; true
-    when Regexp ; dir_targets_filter =~ target
-    when Proc   ; dir_targets_filter.call(target)
-    when String ; target.include?(dir_targets_filter)
+    when Regexp ; self.class.target_filter =~ target_name
+    when Proc   ; self.class.target_filter.call(target_name)
+    when String ; target_name.include?(self.class.target_filter)
     end
   end
 

data/lib/metarake/publisher/freight.rb

@@ -2,7 +2,7 @@ require 'mixlib/shellout'
 
 # Metarake publisher that pushes `.deb` Debian packages to a Freight
 # apt repository (https://github.com/rcrowley/freight).
-module MetaRake::Publisher::Directory
+module MetaRake::Publisher::Freight
   extend MetaRake::Magic
 
   module ClassMethods
@@ -16,38 +16,39 @@ module MetaRake::Publisher::Directory
     attr_accessor :freight_command
 
     # @return [Hash] freight config, plus some random shell environment.
-    def freight_conf
-      @freight_conf ||=
+    def freight_varlib
+      @freight_varlib ||=
         begin
-          raise ValueError, "#{self}.freight_conf_path is not set" unless freight_conf_path
-          conf = Mixlib::ShellOut.new('env', '-i', '/bin/sh', '-c', ". #{freight_conf_path} ; set")
+          raise "#{self}.freight_conf_path is not set" unless freight_conf_path
+          conf = Mixlib::ShellOut.new('env', '-i', '/bin/sh', '-c', ". #{freight_conf_path} ; echo $VARLIB")
           conf.run_command.error!
-          Hash[ conf.stdout.lines.map { |ln| ln.strip.split('=', 2) } ]
+          conf.stdout.strip
         end
     end
   end
 
   # True if all project targets are added to the repository
   def published?
-    raise ValueError, "#{self.class}.freight_distro is not set" unless self.class.freight_distro
+    raise "#{self.class}.freight_distro is not set" unless self.class.freight_distro
     self.targets.map { |tgt| File.exist?(File.join(
-          self.class.freight_conf['VARLIB'], self.class.freight_distro, tgt)) }.all?
+          self.class.freight_varlib, 'apt', self.class.freight_distro,
+          tgt)) }.all?
   end
 
   # Add files to the freight repo and publish them
   def publish!
     self.targets.each do |tgt|
-      sh *(self.freight_command('add') + [
+      sh *(freight_command('add') + [
           File.join(self.to_s, tgt),
           "apt/#{self.class.freight_distro}" ])
     end
-    sh *(self.freight_command('cache'))
+    sh *(freight_command('cache'))
   end
 
   private
-  def freight_command(cmd)
+  def freight_command(subcmd)
     cmd = self.class.freight_command || 'freight'
     cmd = cmd.split if cmd.respond_to?(:split)
-    cmd + [ cmd, '-c' self.class.freight_conf_path ]
+    cmd + [ subcmd, '-c', self.class.freight_conf_path ]
   end
 end

data/lib/metarake/version.rb

@@ -1,3 +1,3 @@
 module MetaRake
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metarake
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,6 +90,7 @@ files:
 - README.md
 - Rakefile
 - examples/Rakefile.basic
+- examples/Rakefile.fpm_and_freight
 - features/basic.feature
 - features/files/Rakefile.one_two_three
 - features/step_definitions/basic.rb
@@ -113,21 +114,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2320268432724083561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2320268432724083561
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rake extension to manage multiple builds
@@ -136,4 +131,3 @@ test_files:
 - features/files/Rakefile.one_two_three
 - features/step_definitions/basic.rb
 - features/support/env.rb
-has_rdoc: