fpm-cookery 0.5.0 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.6.0 (2011-11-19)
+* Add a logging/output system.
+* Improve extracted source detection for the curl and svn source handler.
+* Allow absolute paths for pre/post scripts.
+
 # v0.5.0 (2011-11-05)
 * Add git source handler.
 

data/README.md

@@ -132,7 +132,6 @@ The following is an example recipe. I have some more in my recipe collection
 * No recipe validation yet.
 * No dependency validation yet.
 * No support for patches yet.
-* No real logging output yet.
 * Pretty new and not well tested.
 
 ## Credits

data/lib/fpm/cookery/cli.rb

@@ -1,11 +1,20 @@
 require 'fpm/cookery/book_hook'
 require 'fpm/cookery/recipe'
+require 'fpm/cookery/facts'
 require 'fpm/cookery/packager'
+require 'fpm/cookery/log'
+require 'fpm/cookery/log/output/console'
+require 'fpm/cookery/log/output/console_color'
 require 'optparse'
 
 module FPM
   module Cookery
     class CLI
+      def initialize
+        @colors = true
+        @debug = false
+      end
+
       def args(argv)
         program = File.basename($0)
         options = OptionParser.new
@@ -16,6 +25,15 @@ module FPM
         options.separator "  clean - cleans up"
         options.separator "Options:"
 
+        options.on("-c", "--color",
+                   "Toggle color. (default #{@colors.inspect})") do |o|
+          @colors = !@colors
+        end
+
+        options.on("-D", "--debug", "Enable debug output.") do |o|
+          @debug = true
+        end
+
         options.on("-t TARGET", "--target TARGET",
                   "Set the desired fpm output target (deb, rpm, etc)") do |o|
           @target = o
@@ -29,6 +47,14 @@ module FPM
         # Parse flags and such, remainder is all non-option args.
         remainder = options.parse(argv)
 
+        # Initialize logging.
+        FPM::Cookery::Log.enable_debug(@debug)
+        if @colors
+          FPM::Cookery::Log.output(FPM::Cookery::Log::Output::ConsoleColor.new)
+        else
+          FPM::Cookery::Log.output(FPM::Cookery::Log::Output::Console.new)
+        end
+
         # Default recipe to find is in current directory named 'recipe.rb'
         @filename = File.expand_path('recipe.rb')
 
@@ -56,14 +82,13 @@ module FPM
 
       def validate
         unless File.exists?(@filename)
-          STDERR.puts 'No recipe.rb found in the current directory, abort.'
+          Log.error 'No recipe.rb found in the current directory, abort.'
           exit 1
         end
 
         # Default action is "package"
         if @actions.empty?
           @actions = ["package"]
-          puts "No actions given, assuming 'package'"
         end
 
         # Override the detected platform.
@@ -76,12 +101,10 @@ module FPM
         end
 
         if FPM::Cookery::Facts.target.nil?
-          STDERR.puts "No target given and we're unable to detect your platform"
+          Log.error "No target given and we're unable to detect your platform"
           exit 1
         end
 
-        puts "Platform: #{FPM::Cookery::Facts.platform}"
-        puts "Target:   #{FPM::Cookery::Facts.target}"
       end
 
       def run
@@ -99,7 +122,7 @@ module FPM
             when "package" ; packager.dispense
             else
               # TODO(sissel): fail if this happens
-              puts "Unknown action: #{action}"
+              Log.error "Unknown action: #{action}"
             end
           end
         end

data/lib/fpm/cookery/log/color.rb

@@ -0,0 +1,53 @@
+module FPM
+  module Cookery
+    module Log
+      class Color
+        CODES = {
+          :black   => 30,
+          :blue    => 34,
+          :cyan    => 36,
+          :green   => 32,
+          :magenta => 35,
+          :red     => 31,
+          :reset   => 0,
+          :white   => 39,
+          :yellow  => 33,
+        }
+
+        class << self
+          def color(name, type = nil)
+            tint = CODES[name] || 0
+
+            case type
+            when :bold
+              escape("1;#{tint}")
+            when :underline
+              escape("4;#{tint}")
+            else
+              escape(tint)
+            end
+          end
+
+          def colorize(string, tint, type = nil)
+            "#{color(tint, type)}#{string}#{color(:reset)}"
+          end
+
+          def black(string, type = nil)   colorize(string, :black, type)   end
+          def blue(string, type = nil)    colorize(string, :blue, type)    end
+          def cyan(string, type = nil)    colorize(string, :cyan, type)    end
+          def green(string, type = nil)   colorize(string, :green, type)   end
+          def magenta(string, type = nil) colorize(string, :magenta, type) end
+          def red(string, type = nil)     colorize(string, :red, type)     end
+          def reset(string, type = nil)   colorize(string, :reset, type)   end
+          def white(string, type = nil)   colorize(string, :white, type)   end
+          def yellow(string, type = nil)  colorize(string, :yellow, type)  end
+
+          private
+          def escape(num)
+            "\033[#{num}m" if $stdout.tty?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/log/output/console.rb

@@ -0,0 +1,34 @@
+
+module FPM
+  module Cookery
+    module Log
+      module Output
+        class Console
+          def debug(message)
+            STDOUT.puts "DEBUG: #{message}"
+          end
+
+          def info(message)
+            STDOUT.puts "===> #{message}"
+          end
+
+          def puts(message)
+            STDOUT.puts "#{message}"
+          end
+
+          def warn(message)
+            STDERR.puts "WARNING: #{message}"
+          end
+
+          def error(message)
+            STDERR.puts "ERROR: #{message}"
+          end
+
+          def fatal(message)
+            STDERR.puts "FATAL: #{message}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/log/output/console_color.rb

@@ -0,0 +1,35 @@
+require 'fpm/cookery/log/color'
+
+module FPM
+  module Cookery
+    module Log
+      module Output
+        class ConsoleColor
+          def debug(message)
+            puts "#{Color.cyan('DEBUG:')} #{message}"
+          end
+
+          def info(message)
+            puts "#{Color.blue('===>')} #{message}"
+          end
+
+          def puts(message)
+            Kernel.puts "#{message}"
+          end
+
+          def warn(message)
+            STDERR.puts "#{Color.yellow('WARNING:')} #{message}"
+          end
+
+          def error(message)
+            STDERR.puts "#{Color.red('ERROR:')} #{message}"
+          end
+
+          def fatal(message)
+            STDERR.puts "#{Color.red('FATAL:', :bold)} #{message}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/log/output/null.rb

@@ -0,0 +1,12 @@
+module FPM
+  module Cookery
+    module Log
+      module Output
+        class Null
+          def method_missing(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/log.rb

@@ -0,0 +1,44 @@
+require 'fpm/cookery/log/output/null'
+
+module FPM
+  module Cookery
+    module Log
+      @debug = false
+      @output = FPM::Cookery::Log::Output::Null.new
+
+      class << self
+        def enable_debug(value = true)
+          @debug = value
+        end
+
+        def output(out)
+          @output = out
+        end
+
+        def debug(message)
+          @output.debug(message) if @debug
+        end
+
+        def info(message)
+          @output.info(message)
+        end
+
+        def warn(message)
+          @output.warn(message)
+        end
+
+        def error(message)
+          @output.error(message)
+        end
+
+        def fatal(message)
+          @output.fatal(message)
+        end
+
+        def puts(message)
+          @output.puts(message)
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/packager.rb

@@ -3,6 +3,8 @@
 #require 'fpm/cookery/dependency_inspector'
 require 'fpm/cookery/utils'
 require 'fpm/cookery/source_integrity_check'
+require 'fpm/cookery/path'
+require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -22,6 +24,7 @@ module FPM
       end
 
       def cleanup
+        Log.info "Cleanup!"
         # TODO(sissel): do some sanity checking to make sure we don't
         # accidentally rm -rf the wrong thing.
         FileUtils.rm_rf(recipe.builddir)
@@ -30,6 +33,12 @@ module FPM
 
       def dispense
         env = ENV.to_hash
+        package_name = "#{recipe.name}-#{recipe.version}"
+        platform = FPM::Cookery::Facts.platform
+        target = FPM::Cookery::Facts.target
+
+        Log.info "Starting package creation for #{package_name} (#{platform}, #{target})"
+        Log.info ''
 
         # RecipeInspector.verify!(recipe)
         # DependencyInspector.verify!(recipe.depends, recipe.build_depends)
@@ -40,26 +49,27 @@ module FPM
 
         recipe.cachedir.mkdir
         Dir.chdir(recipe.cachedir) do
+          Log.info "Fetching source: #{source.source_url}"
           source.fetch
 
           if source.checksum?
             SourceIntegrityCheck.new(recipe).tap do |check|
               if check.checksum_missing?
-                STDERR.puts <<-__WARN
-  WARNING: Recipe does not provide a checksum. (sha256, sha1 or md5)
-  ------------------------------------------------------------------
+                Log.warn 'Recipe does not provide a checksum. (sha256, sha1 or md5)'
+                Log.puts <<-__WARN
   Digest:   #{check.digest}
   Checksum: #{check.checksum_actual}
   Filename: #{check.filename}
+
                 __WARN
               elsif check.error?
-                STDERR.puts <<-__ERROR
-  ERROR: Integrity check failed!
-  ------------------------------
+                Log.error 'Integrity check failed!'
+                Log.puts <<-__ERROR
   Digest:            #{check.digest}
   Checksum expected: #{check.checksum_expected}
   Checksum actual:   #{check.checksum_actual}
   Filename:          #{check.filename}
+
                 __ERROR
                 exit 1
               end
@@ -74,11 +84,12 @@ module FPM
           Dir.chdir(extracted_source) do
             #Source::Patches.new(recipe.patches).apply!
 
-            build_cookie = build_cookie_name("#{recipe.name}-#{recipe.version}")
+            build_cookie = build_cookie_name(package_name)
 
             if File.exists?(build_cookie)
-              STDERR.puts 'Skipping build (`fpm-cook clean` to rebuild)'
+              Log.info 'Skipping build (`fpm-cook clean` to rebuild)'
             else
+              Log.info "Building in #{File.expand_path(extracted_source)}"
               recipe.build and FileUtils.touch(build_cookie)
             end
 
@@ -87,6 +98,7 @@ module FPM
 
             begin
               recipe.installing = true
+              Log.info "Installing into #{recipe.destdir}"
               recipe.install
             ensure
               recipe.installing = false
@@ -160,11 +172,17 @@ module FPM
           script_map = {"pre_install" => "--pre-install", "post_install" => "--post-install", "pre_uninstall" => "--pre-uninstall", "post_uninstall" => "--post-uninstall"}
           %w[pre_install post_install pre_uninstall post_uninstall].each do |script|
             unless recipe.send(script).nil?
-              script_file = File.expand_path("../#{recipe.send(script)}", recipe.filename)
+              script_file = FPM::Cookery::Path.new(recipe.send(script))
+
+              # If the script file is an absolute path, just use that path.
+              # Otherwise consider the location relative to the recipe.
+              unless script_file.absolute?
+                script_file = File.expand_path("../#{script_file.to_s}", recipe.filename)
+              end
 
               if File.exists?(script_file)
                 p_opt = script_map[script]
-                opts += ["#{p_opt}", script_file]
+                opts += ["#{p_opt}", script_file.to_s]
               else
                 raise "#{script} script '#{script_file}' is missing"
               end
@@ -181,7 +199,8 @@ module FPM
 
           opts << '.'
 
-          STDERR.puts ['fpm', opts].flatten.inspect
+          Log.info 'Calling fpm to build the package'
+          Log.debug ['fpm', opts].flatten.inspect
           safesystem(*['fpm', opts].flatten)
         end
       end

data/lib/fpm/cookery/source_handler/curl.rb

@@ -1,4 +1,5 @@
 require 'fpm/cookery/source_handler/template'
+require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -9,7 +10,9 @@ module FPM
         CHECKSUM = true
 
         def fetch
-          unless local_path.exist?
+          if local_path.exist?
+            Log.info "Using cached file #{local_path}"
+          else
             Dir.chdir(cachedir) do
               curl(url, local_path) unless local_path.exist?
             end
@@ -25,8 +28,8 @@ module FPM
             when '.zip'
               safesystem('unzip', '-d', local_path.basename('.zip'), local_path)
             end
+            extracted_source
           end
-          extracted_source
         end
 
         private
@@ -43,8 +46,10 @@ module FPM
           when 1
             entries.first
           else
-            ext = Path.new(url).extname
-            dir = local_path.basename(ext)
+            # Use the directory that was created last.
+            dir = entries.sort do |a, b|
+              File.stat(a).ctime <=> File.stat(b).ctime
+            end.last
 
             if File.exist?(dir)
               dir

data/lib/fpm/cookery/source_handler/git.rb

@@ -1,4 +1,5 @@
 require 'fpm/cookery/source_handler/template'
+require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -48,7 +49,7 @@ module FPM
 
         private
         def git(command, *args)
-          #puts "[DEBUG] git #{command} #{args.join(' ')}"
+          #Log.debug "git #{command} #{args.join(' ')}"
           safesystem('git', command, *args)
         end
       end

data/lib/fpm/cookery/source_handler/svn.rb

@@ -19,8 +19,8 @@ module FPM
         def extract
           Dir.chdir(builddir) do
             safesystem('cp', '-Rp', local_path, '.')
+            extracted_source
           end
-          extracted_source
         end
 
         private
@@ -38,8 +38,10 @@ module FPM
           when 1
             entries.first
           else
-            ext = Path.new(url).extname
-            dir = local_path.basename(ext)
+            # Use the directory that was created last.
+            dir = entries.sort do |a, b|
+              File.stat(a).ctime <=> File.stat(b).ctime
+            end.last
 
             if File.exist?(dir)
               dir

data/lib/fpm/cookery/source_handler.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'fpm/cookery/source_handler/curl'
 require 'fpm/cookery/source_handler/svn'
 require 'fpm/cookery/source_handler/git'
+require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -11,6 +12,8 @@ module FPM
       extend Forwardable
       def_delegators :@handler, :fetch, :extract, :local_path, :checksum?
 
+      attr_reader :source_url
+
       def initialize(source_url, options, cachedir, builddir)
         # The reason for these checks is related to the test cases
         # Test cases for individual recipe attributes
@@ -38,7 +41,7 @@ module FPM
         begin
           self.class.const_get(provider.to_s.capitalize)
         rescue NameError
-          STDERR.puts "Specified provider #{provider} does not exist."
+          Log.error "Specified provider #{provider} does not exist."
           exit(1)
         end
       end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &80020110 !ruby/object:Gem::Requirement
+  requirement: &82971890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80020110
+  version_requirements: *82971890
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &80019860 !ruby/object:Gem::Requirement
+  requirement: &82971550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80019860
+  version_requirements: *82971550
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80019630 !ruby/object:Gem::Requirement
+  requirement: &82970380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80019630
+  version_requirements: *82970380
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &80019400 !ruby/object:Gem::Requirement
+  requirement: &82969850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80019400
+  version_requirements: *82969850
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &80019160 !ruby/object:Gem::Requirement
+  requirement: &82968920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80019160
+  version_requirements: *82968920
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -86,6 +86,11 @@ files:
 - lib/fpm/cookery/book_hook.rb
 - lib/fpm/cookery/cli.rb
 - lib/fpm/cookery/facts.rb
+- lib/fpm/cookery/log.rb
+- lib/fpm/cookery/log/color.rb
+- lib/fpm/cookery/log/output/console.rb
+- lib/fpm/cookery/log/output/console_color.rb
+- lib/fpm/cookery/log/output/null.rb
 - lib/fpm/cookery/packager.rb
 - lib/fpm/cookery/path.rb
 - lib/fpm/cookery/path_helper.rb
@@ -128,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A tool for building software packages with fpm.