fpm-cookery 0.10.0 → 0.11.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.11.0 (2012-08-20)
+* Add source handler to handle local source directories via file:// urls.
+
 # v0.10.0 (2012-08-12)
 * Add support for shar and bin files to curl source handler. (brandonmartin)
 * Support an optional basename parameter for the `install` helper.

data/lib/fpm/cookery/recipe.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 require 'fileutils'
 require 'fpm/cookery/facts'
+require 'fpm/cookery/source'
 require 'fpm/cookery/source_handler'
 require 'fpm/cookery/utils'
 require 'fpm/cookery/path_helper'
@@ -79,7 +80,7 @@ module FPM
 
       def initialize(filename)
         @filename = Path.new(filename).expand_path
-        @source_handler = SourceHandler.new(source, spec, cachedir, builddir)
+        @source_handler = SourceHandler.new(Source.new(source, spec), cachedir, builddir)
 
         # Set some defaults.
         vendor || self.class.vendor('fpm')

data/lib/fpm/cookery/source.rb

@@ -0,0 +1,41 @@
+require 'uri'
+
+module FPM
+  module Cookery
+    class Source
+      attr_reader :provider, :options
+
+      def initialize(url, options = nil)
+        options ||= {}
+
+        @url = URI(url.to_s)
+        @provider = options[:with]
+        @options = options
+      end
+
+      def provider?
+        !!@provider
+      end
+
+      def local?
+        @url.scheme.to_s.downcase == 'file'
+      end
+
+      def url
+        @url.to_s
+      end
+
+      def path
+        @url.path
+      end
+
+      def to_s
+        @url.to_s
+      end
+
+      def to_str
+        @url.to_s
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'fpm/cookery/source_handler/template'
+require 'fpm/cookery/log'
+require 'fileutils'
+
+module FPM
+  module Cookery
+    class SourceHandler
+      class LocalPath < FPM::Cookery::SourceHandler::Template
+        CHECKSUM = false
+        NAME = :local_path
+
+        def fetch
+          # No need to fetch anything. The files are on the disk already.
+          Log.info "Local path: #{source.path}"
+          @local_path = source.path
+        end
+
+        def extract
+          extracted_source = (builddir/File.basename(local_path)).to_s
+
+          FileUtils.rm_rf(extracted_source)
+          FileUtils.cp_r(source.path, extracted_source)
+
+          extracted_source
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,10 @@ module FPM
           @name = self.class::NAME
         end
 
+        def source
+          @url
+        end
+
         def fetch
           raise "#{self}#fetch not implemented!"
         end

data/lib/fpm/cookery/source_handler.rb

@@ -3,44 +3,46 @@ require 'fpm/cookery/source_handler/curl'
 require 'fpm/cookery/source_handler/svn'
 require 'fpm/cookery/source_handler/git'
 require 'fpm/cookery/source_handler/hg'
+require 'fpm/cookery/source_handler/local_path'
 require 'fpm/cookery/log'
 
 module FPM
   module Cookery
     class SourceHandler
       DEFAULT_HANDLER = :curl
+      LOCAL_HANDLER = :local_path
 
       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
-        # are not setting spec before hand (due to delegation chain?)
-        # Additionally, one test actually has options being sent as a String
-        if (options.nil? || options.class == String || options.has_key?(:with) == false)
-          @source_provider = DEFAULT_HANDLER
-        else
-          @source_provider = options[:with]
-        end
-        @source_url = source_url
-        @options = options
+      def initialize(source, cachedir, builddir)
+        @source = source
         @cachedir = cachedir
         @builddir = builddir
+
+        if @source.provider?
+          @source_provider = @source.provider
+        elsif @source.local?
+          @source_provider = LOCAL_HANDLER
+        else
+          @source_provider = DEFAULT_HANDLER
+        end
+
         @handler = get_source_handler(@source_provider)
       end
 
       private
       def get_source_handler(provider)
         klass = handler_to_class(provider)
-        klass.new(@source_url, @options, @cachedir, @builddir)
+        # XXX Refactor handler to avoid passing the options.
+        klass.new(@source, @source.options, @cachedir, @builddir)
       end
 
       def handler_to_class(provider)
         begin
-          self.class.const_get(provider.to_s.capitalize)
+          self.class.const_get(provider.to_s.split('_').map(&:capitalize).join)
         rescue NameError
           Log.error "Specified provider #{provider} does not exist."
           exit(1)

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/spec/recipe_spec.rb

@@ -51,52 +51,131 @@ describe "Recipe" do
   #############################################################################
   # Recipe attributes
   #############################################################################
-  def self.spec_recipe_attribute(name, value)
-    value = Numeric === value ? value : "\"#{value}\""
-    class_eval %Q{
-      describe "##{name}" do
-        it "can be set" do
-          klass.class_eval { #{name} #{value} }
-          klass.#{name}.must_equal #{value}
-          recipe.#{name}.must_equal #{value}
-        end
-      end
-    }
+  def check_attribute(attr, value, expect = nil)
+    expect ||= value
+
+    klass.send(attr, value)
+
+    klass.send(attr).must_equal expect
+    recipe.send(attr).must_equal expect
+  end
+
+  describe "#arch" do
+    it "can be set" do
+      check_attribute(:arch, 'i386')
+    end
+  end
+
+  describe "#description" do
+    it "can be set" do
+      check_attribute(:description, 'A nice program.')
+    end
+  end
+
+  describe "#homepage" do
+    it "can be set" do
+      check_attribute(:homepage, 'http://example.com/')
+    end
+  end
+
+  describe "#license" do
+    it "can be set" do
+      check_attribute(:license, 'MIT')
+    end
   end
 
-  spec_recipe_attribute(:arch, 'i386')
-  spec_recipe_attribute(:description, 'A nice program.')
-  spec_recipe_attribute(:homepage, 'http://example.com')
-  spec_recipe_attribute(:license, 'MIT')
-  spec_recipe_attribute(:maintainer, 'John Doe <john@example.com>')
-  spec_recipe_attribute(:sha256, '123456789abcdef')
-  spec_recipe_attribute(:sha1, '123456789abcdef')
-  spec_recipe_attribute(:md5, '123456789abcdef')
-  spec_recipe_attribute(:name, 'redis')
-  spec_recipe_attribute(:revision, 12)
-  spec_recipe_attribute(:section, 'lang')
-  # NOTE(lusis)
-  # see comment in `SourceHandler#initialize` r.e. options as `String`
-  spec_recipe_attribute(:spec, {:foo => true})
-  spec_recipe_attribute(:vendor, 'myvendor')
-  spec_recipe_attribute(:version, '1.2')
-  spec_recipe_attribute(:pre_install, 'preinstall')
-  spec_recipe_attribute(:post_install, 'postinstall')
-  spec_recipe_attribute(:pre_uninstall, 'preuninstall')
-  spec_recipe_attribute(:post_uninstall, 'postuninstall')
+  describe "#maintainer" do
+    it "can be set" do
+      check_attribute(:maintainer, 'John Doe <john@example.com>')
+    end
+  end
+
+  describe "#sha256" do
+    it "can be set" do
+      check_attribute(:sha256, '123456789abcdef')
+    end
+  end
+
+  describe "#sha1" do
+    it "can be set" do
+      check_attribute(:sha1, '123456789abcdef')
+    end
+  end
+
+  describe "#md5" do
+    it "can be set" do
+      check_attribute(:md5, '123456789abcdef')
+    end
+  end
+
+  describe "#name" do
+    it "can be set" do
+      check_attribute(:name, 'redis')
+    end
+  end
 
   describe "#revision" do
+    it "can be set with a string" do
+      check_attribute(:revision, '12')
+    end
+
     it "sets a default revision" do
       recipe.revision.must_equal 0
     end
   end
 
+  describe "#section" do
+    it "can be set" do
+      check_attribute(:section, 'lang')
+    end
+  end
+
+  describe "#spec" do
+    it "can be set" do
+      check_attribute(:spec, {:foo => true})
+    end
+  end
+
   describe "#vendor" do
+    it "can be set" do
+      check_attribute(:vendor, 'myvendor')
+    end
+
     it "sets a default vendor" do
       recipe.vendor.must_equal 'fpm'
     end
   end
 
+  describe "#version" do
+    it "can be set" do
+      check_attribute(:version, '1.2')
+    end
+  end
+
+  describe "#pre_install" do
+    it "can be set" do
+      check_attribute(:pre_install, 'preinstall')
+    end
+  end
+
+  describe "#post_install" do
+    it "can be set" do
+      check_attribute(:post_install, 'postinstall')
+    end
+  end
+
+  describe "#pre_uninstall" do
+    it "can be set" do
+      check_attribute(:pre_uninstall, 'preuninstall')
+    end
+  end
+
+  describe "#post_uninstall" do
+    it "can be set" do
+      check_attribute(:post_uninstall, 'postuninstall')
+    end
+  end
+
   def self.spec_recipe_attribute_list(name, list)
     class_eval %Q{
       describe "##{name}" do

data/spec/source_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'fpm/cookery/source'
+
+describe "Source" do
+  describe "#provider?" do
+    context "with a provider set" do
+      it "returns true" do
+        source = FPM::Cookery::Source.new('http://example.com/', :with => :git)
+
+        source.provider?.must_equal true
+      end
+    end
+
+    context "without a provider set" do
+      it "returns false" do
+        source = FPM::Cookery::Source.new('http://example.com/')
+
+        source.provider?.must_equal false
+      end
+    end
+  end
+
+  describe "#local?" do
+    context "with a file:// url" do
+      it "returns true" do
+        source = FPM::Cookery::Source.new('file:///tmp')
+
+        source.local?.must_equal true
+      end
+    end
+
+    context "with no file:// url" do
+      it "returns false" do
+        source = FPM::Cookery::Source.new('https://www.example.com/')
+
+        source.local?.must_equal false
+      end
+    end
+  end
+
+  describe "#path" do
+    it "returns the url path" do
+      source = FPM::Cookery::Source.new('file:///opt/src/foo')
+
+      source.path.must_equal '/opt/src/foo'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -121,10 +121,12 @@ files:
 - lib/fpm/cookery/path.rb
 - lib/fpm/cookery/path_helper.rb
 - lib/fpm/cookery/recipe.rb
+- lib/fpm/cookery/source.rb
 - lib/fpm/cookery/source_handler.rb
 - lib/fpm/cookery/source_handler/curl.rb
 - lib/fpm/cookery/source_handler/git.rb
 - lib/fpm/cookery/source_handler/hg.rb
+- lib/fpm/cookery/source_handler/local_path.rb
 - lib/fpm/cookery/source_handler/svn.rb
 - lib/fpm/cookery/source_handler/template.rb
 - lib/fpm/cookery/source_integrity_check.rb
@@ -139,6 +141,7 @@ files:
 - spec/path_spec.rb
 - spec/recipe_spec.rb
 - spec/source_integrity_check_spec.rb
+- spec/source_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -154,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4411516552651280522
+      hash: -1591651962376197617
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4411516552651280522
+      hash: -1591651962376197617
 requirements: []
 rubyforge_project: fpm-cookery
 rubygems_version: 1.8.24