gpm 0.1.3 → 0.1.7

data/lib/gpm/cli.rb

@@ -1,5 +1,7 @@
 require 'thor'
+require_relative 'gpm_logging'
 require_relative 'packaging_task'
+
 class GpmCli < Thor
   def self.supported_sources
     ["gem","bundler"]

data/lib/gpm/gpm_logging.rb

@@ -0,0 +1,12 @@
+require 'logger'
+env_log_level = ENV["GPM_LOG_LEVEL"].to_s.upcase.to_sym
+GPM_LOG_LEVEL = ::Logger.constants.include?(env_log_level) ? ::Logger.const_get(env_log_level) : ::Logger::INFO
+GPM_LOG_DESTINATION = STDOUT
+
+class Object
+  def create_logger
+    logger = ::Logger.new(GPM_LOG_DESTINATION)
+    logger.level = GPM_LOG_LEVEL
+    logger
+  end
+end

data/lib/gpm/source/files_providers/files_from_bundler_directory_provider.rb

@@ -15,6 +15,7 @@ module Source
       @gemfile = gemfile
       @gemspec = gemspec
       @vendored_gems_installer = vendored_gems_installer || Source::VendoredGemsInstaller.new(gemfile)
+      @installed = false
     end
 
     def bundled_files
@@ -26,7 +27,10 @@ module Source
     end
 
     def file_contents
-      @vendored_gems_installer.install!
+      unless @installed
+        @vendored_gems_installer.install!
+        @installed = true
+      end
       super_contents = super.merge(read_file_contents(bundled_files+[File.basename(gemfile),File.basename(gemspec),'Gemfile.lock','.bundle/config'], directory))
       super_contents
     end

data/lib/gpm/target.rb

@@ -23,16 +23,13 @@ module Target
     def self.add_step_for_phase(phase, block, description = nil)
       steps_for_phase(phase) << [block, description]
     end
-    class_inheritable_array *phase_steps_names
+    class_attribute *phase_steps_names
     phase_steps_names.each {|p| self.send("#{p}=".to_sym,[])}
 
-    include GenerateFromTemplates
-    include ZipDirectories
     attr_reader :work_dir, :options
     def initialize(work_dir, options = {})
       @work_dir = work_dir
-      @logger = ::Logger.new(STDERR)
-      @logger.level = ::Logger::INFO
+      @logger = create_logger
       @options = options
     end
 

data/lib/gpm/target/deb.rb

@@ -37,7 +37,7 @@ class Target::Deb < Target::Base
     def initialize(source)
       raise("nil source") unless source
       super(source)
-      @logger = ::Logger.new(STDERR)
+      @logger = create_logger
     end
 
     def permission_overrides
@@ -121,9 +121,12 @@ class Target::Deb < Target::Base
   def all_binaries
     Dir["**/*.so"]
   end
-
+  in_phase(:file_creation, "Generating files from source...") { |source| write_file_contents_in_directory source.file_contents, File.join("data.tar.gz.dir",options[:destination] || "") }
   in_phase(:file_creation, "Stripping links from binaries...") { exec("strip --strip-unneeded #{all_binaries.join(' ')}") unless all_binaries.empty? }
   in_phase(:file_creation, "Removing absolute paths from binaries...") { exec("chrpath --delete #{all_binaries.join(' ')}") unless all_binaries.empty? }
+  include GenerateFromTemplates
+  add_generation_phase("Expanding templates another time to get correct md5sums")
+  include ZipDirectories
   in_phase(:file_creation, "Making files unwriteable by group and others...") { exec("chmod -R go-w *") }
   in_phase(:packaging, "Packaging metafiles and files into .deb package...") {|source| exec("ar -qc ../#{source.default_output} debian-binary control.tar.gz data.tar.gz") }
   in_phase(:packaging, "Copying .deb package to output directory...") {|source| FileUtils.cp("../#{source.default_output}",@origin_dir) }
@@ -131,9 +134,5 @@ class Target::Deb < Target::Base
   def create_package(source)
     super(DebianSourceWrapper.new(source))
   end
-  def write_files_to_package_dir(source)
-    super
-    write_file_contents_in_directory source.file_contents, File.join("data.tar.gz.dir",options[:destination] || "")
-  end
 
 end

data/lib/gpm/target/generate_from_templates.rb

@@ -2,7 +2,13 @@ require_relative 'step_plugin'
 require_relative '../file_path_and_permissions'
 module GenerateFromTemplates
   include StepPlugin
-  in_phase(:file_creation, "Expanding templates...") { |source| write_files_to_package_dir(source) }
+  def self.included(base)
+    def base.add_generation_phase(explanation="Expanding templates...")
+      in_phase(:file_creation, explanation) { |source| write_files_to_package_dir(source) }
+    end
+    base.add_generation_phase
+    self.plugin_included(base)
+  end
 
   def template_paths
     @template_paths ||= Dir["#{template_dir}/**/*.erb"]
@@ -19,7 +25,7 @@ module GenerateFromTemplates
   def templates
     Hash[*template_paths.map {|file| FilePathAndPermissions.new(file.gsub(/#{template_dir}\//,"").gsub(".erb",""),File.new(file).lstat.mode)}.zip(template_paths.map do |template_file|
       tpl = File.read(template_file)
-      ::ERB.new(tpl, nil, "-")
+      ::ERB.new(tpl, nil,'%<>-')
     end).flatten]
   end
 

data/lib/gpm/target/step_plugin.rb

@@ -10,14 +10,17 @@ module StepPlugin
         @phase_blocks[phase] ||= []
         @phase_blocks[phase] << [block, description]
       end
-      def base.included(clazz)
-        @phase_blocks.each do |phase, blocks|
+      def base.plugin_included(clazz)
+        (@phase_blocks || []).each do |phase, blocks|
           blocks.each do |block_and_description|
             block, description = block_and_description
             clazz.add_step_for_phase(phase,block,description)
           end
         end
       end
+      def base.included(clazz)
+        plugin_included(clazz)
+      end
     end
   end
 end

data/templates/deb/control.tar.gz.dir/md5sums.erb

@@ -0,0 +1,6 @@
+<% require 'digest/md5' -%>
+<% Dir.chdir("data.tar.gz.dir") do -%>
+<% Dir.glob('**/*', File::FNM_DOTMATCH).find_all {|f| File.file?(f)}.each do |file_name| -%>
+<%= Digest::MD5.hexdigest(File.read(file_name))%>  <%= file_name %>
+<% end -%>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &75731240 !ruby/object:Gem::Requirement
+  requirement: &76972990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75731240
+  version_requirements: *76972990
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &75730810 !ruby/object:Gem::Requirement
+  requirement: &76972540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *75730810
+  version_requirements: *76972540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &75730540 !ruby/object:Gem::Requirement
+  requirement: &76972240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75730540
+  version_requirements: *76972240
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &75730250 !ruby/object:Gem::Requirement
+  requirement: &76972050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75730250
+  version_requirements: *76972050
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &75729940 !ruby/object:Gem::Requirement
+  requirement: &76971730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *75729940
+  version_requirements: *76971730
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &75729620 !ruby/object:Gem::Requirement
+  requirement: &76971420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *75729620
+  version_requirements: *76971420
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &75729360 !ruby/object:Gem::Requirement
+  requirement: &76971130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *75729360
+  version_requirements: *76971130
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &75729110 !ruby/object:Gem::Requirement
+  requirement: &76970850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *75729110
+  version_requirements: *76970850
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &75728810 !ruby/object:Gem::Requirement
+  requirement: &76970570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *75728810
+  version_requirements: *76970570
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &75728460 !ruby/object:Gem::Requirement
+  requirement: &76970290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,21 +120,21 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *75728460
+  version_requirements: *76970290
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &75728070 !ruby/object:Gem::Requirement
+  requirement: &76970030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *75728070
+  version_requirements: *76970030
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &75727760 !ruby/object:Gem::Requirement
+  requirement: &76969780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *75727760
+  version_requirements: *76969780
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!
@@ -163,6 +163,7 @@ files:
 - lib/gpm/source/bundler.rb
 - lib/gpm/source/gem.rb
 - lib/gpm/packaging_task.rb
+- lib/gpm/gpm_logging.rb
 - lib/gpm/file_path_and_permissions.rb
 - lib/gpm/target.rb
 - lib/gpm/source.rb