fpm-cookery 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.0 (2011-10-22)
+* Add flag for package target. (deb, rpm) (jordansissel)
+* Improve recipe detection. (jordansissel)
+
 # v0.1.0 (2011-10-18)
 * Add `with_trueprefix` path helper.
 * Add and enable source integrity check.

data/README.md

@@ -53,10 +53,8 @@ __fpm-cookery__ is my attempt to build such a tool.
 * Apply custom patches.
 * Dependency checking.
 * Recipe validation.
-* Integrity checks for downloaded archives.
 * More source types. (git, svn, ...)
 * Progress output and logging.
-* Make package output type configurable. (deb, rpm)
 * Extend recipe features and build/install helpers.
 * Configuration file. (for stuff like vendor and maintainer)
 * Options for the `fpm-cook` command.
@@ -133,7 +131,6 @@ The following is an example recipe. I have some more in my recipe collection
 * No recipe documentation and API documentation yet.
 * No recipe validation yet.
 * No dependency validation yet.
-* No integrity check of the downloaded archives yet.
 * No support for patches yet.
 * Only simple source/url types (via curl) for now.
 * No real logging output yet.

data/bin/fpm-cook

@@ -4,4 +4,4 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'fpm/cookery/cli'
 
-FPM::Cookery::CLI.new(ARGV).run
+FPM::Cookery::CLI.new.args(ARGV).run

data/lib/fpm/cookery/cli.rb

@@ -1,32 +1,90 @@
 require 'fpm/cookery/book_hook'
 require 'fpm/cookery/recipe'
 require 'fpm/cookery/packager'
+require 'optparse'
 
 module FPM
   module Cookery
     class CLI
-      def initialize(argv)
-        @argv = argv
-      end
+      def args(argv)
+        program = File.basename($0)
+        options = OptionParser.new
+        options.banner = \
+          "Usage: #{program} [options] [path/to/recipe.rb] action [...]"
+        options.separator "Actions:"
+        options.separator "  package - builds the package"
+        options.separator "  clean - cleans up"
+        options.separator "Options:"
 
-      def run
-        filename = @argv.find {|arg| arg =~ /\.rb$/ and File.exists?(arg) }
-        filename ||= File.expand_path('recipe.rb')
+        options.on("-t TARGET", "--target TARGET",
+                  "Set the desired fpm output target (deb, rpm, etc)") do |o|
+          @target = o
+        end
+
+        # Parse flags and such, remainder is all non-option args.
+        remainder = options.parse(argv)
+
+        # Default recipe to find is in current directory named 'recipe.rb'
+        @filename = File.expand_path('recipe.rb')
+
+        # See if something that looks like a recipe path is in arguments
+        remainder.each do |arg|
+          # If 'foo.rb' was given, and it exists, use it.
+          if arg =~ /\.rb$/ and File.exists?(arg)
+            remainder.delete(arg)
+            @filename = arg
+            break
+          end
+
+          # Allow giving the directory containing a recipe.rb
+          if File.directory?(arg) and File.exists?(File.join(arg, "recipe.rb"))
+            remainder.delete(arg)
+            @filename = File.join(arg, "recipe.rb")
+            break
+          end
+        end
 
-        unless File.exists?(filename)
+        # Everything that's not the recipe filename is an action.
+        @actions = remainder
+        return self
+      end
+
+      def validate
+        unless File.exists?(@filename)
           STDERR.puts 'No recipe.rb found in the current directory, abort.'
           exit 1
         end
 
+        if @target.nil?
+          # TODO(sissel): Detect platform, try to guess @target?
+          @target = "deb"
+          puts "No --target given, assuming #{@target}"
+        end
+
+        # Default action is "package"
+        if @actions.empty?
+          @actions = ["package"]
+          puts "No actions given, assuming 'package'"
+        end
+      end
+
+      def run
+        validate
+
         FPM::Cookery::Recipe.send(:include, FPM::Cookery::BookHook)
 
-        FPM::Cookery::Book.load_recipe(filename) do |recipe|
+        FPM::Cookery::Book.load_recipe(@filename) do |recipe|
           packager = FPM::Cookery::Packager.new(recipe)
+          packager.target = @target
 
-          if @argv.include?('clean')
-            packager.cleanup
-          else
-            packager.dispense
+          @actions.each do |action|
+            case action
+            when "clean" ; packager.cleanup
+            when "package" ; packager.dispense
+            else
+              # TODO(sissel): fail if this happens
+              puts "Unknown action: #{action}"
+            end
           end
         end
       end

data/lib/fpm/cookery/packager.rb

@@ -16,7 +16,14 @@ module FPM
         @config = config
       end
 
+      def target=(target)
+        # TODO(sissel): do sanity checking
+        @target = target
+      end
+
       def cleanup
+        # TODO(sissel): do some sanity checking to make sure we don't
+        # accidentally rm -rf the wrong thing.
         FileUtils.rm_rf(recipe.builddir)
         FileUtils.rm_rf(recipe.destdir)
       end
@@ -68,7 +75,7 @@ Filename:          #{check.filename}
             build_cookie = build_cookie_name("#{recipe.name}-#{recipe.version}")
 
             if File.exists?(build_cookie)
-              STDERR.puts 'Skipping build (`cook clean` to rebuild)'
+              STDERR.puts 'Skipping build (`fpm-cook clean` to rebuild)'
             else
               recipe.build and FileUtils.touch(build_cookie)
             end
@@ -115,13 +122,15 @@ Filename:          #{check.filename}
             "#{username} <#{useremail}>"
           end
 
+          # TODO(sissel): This should use an API in fpm. fpm doesn't have this
+          # yet.  fpm needs this.
           opts = [
             '-n', recipe.name,
             '-v', version,
-            '-t', 'deb',
+            '-t', @target,
             '-s', 'dir',
             '--url', recipe.homepage || recipe.url,
-            '-C', recipe.destdir,
+            '-C', recipe.destdir.to_s,
             '--maintainer', maintainer,
             '--category', recipe.section || 'optional',
           ]

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &82604870 !ruby/object:Gem::Requirement
+  requirement: &84285390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82604870
+  version_requirements: *84285390
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &82604340 !ruby/object:Gem::Requirement
+  requirement: &84285150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82604340
+  version_requirements: *84285150
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82603770 !ruby/object:Gem::Requirement
+  requirement: &84284930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82603770
+  version_requirements: *84284930
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &82603240 !ruby/object:Gem::Requirement
+  requirement: &84284710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82603240
+  version_requirements: *84284710
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de