fpm-cookery 0.14.0 → 0.14.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.14.1 (2013-06-12)
+* Handle private GitHub URLs. (aussielunix)
+* Fix dependencies in gemspec.
+
 # v0.14.0 (2013-05-31)
 * Install dependencies via Puppet. (andytinycat)
 * Add install-deps action to install dependencies. (andytinycat)

data/fpm-cookery.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "fpm", "~> 0.4"
   s.add_development_dependency "minitest", "~> 4.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "puppet"
   s.add_runtime_dependency "fpm", "~> 0.4"
   s.add_runtime_dependency "facter"
   s.add_runtime_dependency "puppet"
+  s.add_runtime_dependency "addressable"
 end

data/lib/fpm/cookery/source.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'addressable/uri'
 
 module FPM
   module Cookery
@@ -7,8 +7,7 @@ module FPM
 
       def initialize(url, options = nil)
         options ||= {}
-
-        @url = URI(url.to_s)
+        @url = Addressable::URI.parse(url.to_s)
         @provider = options[:with]
         @options = options
       end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.14.0'
+    VERSION = '0.14.1'
   end
 end

data/recipes/fpm-cookery/recipe.rb

@@ -2,9 +2,10 @@ class FPMCookery < FPM::Cookery::Recipe
   description 'building packages'
 
   name     'fpm-cookery'
-  version  '0.13.0'
+  version  '0.14.0'
   revision 0
   homepage 'https://github.com/bernd/fpm-cookery'
+  license  'MIT'
 
   source '', :with => :noop
 
@@ -29,7 +30,7 @@ class FPMCookery < FPM::Cookery::Recipe
 
   def gem_install(name, version = nil)
     v = version.nil? ? '' : "-v #{version}"
-    cleanenv_safesystem "#{destdir}/embedded/bin/gem install #{v} #{name}"
+    cleanenv_safesystem "#{destdir}/embedded/bin/gem install --no-ri --no-rdoc #{v} #{name}"
   end
 
   def create_post_install_hook

data/recipes/fpm-cookery/ruby.rb

@@ -2,25 +2,27 @@ class Ruby200 < FPM::Cookery::Recipe
   description 'The Ruby virtual machine'
 
   name    'ruby'
-  version '2.0.0.0'
+  version '2.0.0.195'
   revision 0
   homepage 'http://www.ruby-lang.org/'
-  source   'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p0.tar.bz2'
-  sha256   'c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f'
+  source   'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p195.tar.bz2'
+  sha256   '0be32aef7a7ab6e3708cc1d65cd3e0a99fa801597194bbedd5799c11d652eb5b'
 
   license 'The Ruby License'
   section 'interpreters'
 
   build_depends 'autoconf', 'libreadline6-dev', 'bison', 'zlib1g-dev',
-                'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev', 'libncurses5-dev',
-                'libreadline6-dev'
+                'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev',
+                'libncurses5-dev', 'libreadline6-dev'
 
   depends 'libffi6', 'libncurses5', 'libreadline6', 'libssl1.0.0',
-          'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3', 'libncurses5',
-          'libreadline6'
+          'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3',
+          'libncurses5', 'libreadline6'
 
   def build
-    configure :prefix => destdir, 'disable-install-doc' => true
+    configure :prefix => destdir,
+              'enable-shared' => true,
+              'disable-install-doc' => true
     make
   end
 

data/spec/source_spec.rb

@@ -45,4 +45,13 @@ describe "Source" do
       source.path.must_equal '/opt/src/foo'
     end
   end
+
+  context "with a private GitHub URL" do
+    it "can handle it" do
+      source = FPM::Cookery::Source.new('git@github.com:foo/bar.git')
+
+      source.url.must_equal 'git@github.com:foo/bar.git'
+      source.path.must_equal 'foo/bar.git'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fpm
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,39 +44,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: fpm
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '0.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: fpm
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: puppet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -199,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1124392889621969599
+      hash: 2383654028403994465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1124392889621969599
+      hash: 2383654028403994465
 requirements: []
 rubyforge_project: fpm-cookery
 rubygems_version: 1.8.25