gpm 0.1.7 → 0.1.9

data/lib/gpm/cli.rb

@@ -13,7 +13,7 @@ class GpmCli < Thor
   desc "package APP_DIRECTORY_OR_FILE", "Packages the app given in a specified source format to a desired target format"
   method_option :source, :type => :string, :aliases => "-s", :desc => "The input for creating the package (Currently supported: #{supported_sources.join(', ')})", :required => true
   method_option :target, :type => :string, :aliases => "-t", :desc => "The desired output format for the package (Currently supported: #{supported_targets.join(', ')})", :required => true
-  method_option :workdir, :type => :string, :aliases => "-wd", :desc => "A directory in which temporary files can be placed"
+  method_option :workdir, :type => :string, :aliases => "-w", :desc => "A directory in which temporary files can be placed"
   method_option :destination, :type => :string, :aliases => "-d", :desc => "The destination path where the application shall be installed to", :required => true
   method_option :owner, :type => :string, :aliases => "-o", :desc => "The owning user for the destination path", :default => "root"
   method_option :group, :type => :string, :aliases => "-g", :desc => "The owning group for the destination path", :default => "root"

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

@@ -12,16 +12,15 @@ module Source
     end
     def install!
       return if @installed
-      backup_fields = ["PATH","GEM_PATH"]
+      delete_fields = ["RUBYOPT"]
       bundled_files = []
 
       old_env = ENV.to_hash
       Dir.chdir(directory) do
         ::Bundler.with_clean_env do
-          old_env.each {|k,_| ENV.delete k}
+          delete_fields.each { |d| ENV.delete d}
           ENV["BUNDLE_GEMFILE"] = gemfile
           ENV["PWD"] = directory
-          backup_fields.each {|f| ENV[f] = old_env[f]}
           FileUtils.rm_rf('.bundle')
           ["bundle install","bundle install --deployment --verbose"].each do |c| # --standalone
             command_result = `#{c}`

data/lib/gpm/source/gem.rb

@@ -74,7 +74,7 @@ class Gem < Base
     @options = options
   end
 
-  %w(description license summary version email).each do |method|
+  %w(description license summary version).each do |method|
     define_method method do
       metadata.send(method)
     end
@@ -102,6 +102,12 @@ class Gem < Base
     'Languages/Development/Ruby'
   end
 
+  def email
+    result = metadata.email
+    return result.kind_of?(Array) ? result.first : result
+  end
+
+
   def architecture
     # if the gemspec has extensions defined, then this should be a 'native' arch.
     if !metadata.extensions.empty?
@@ -135,4 +141,4 @@ class Gem < Base
     files_provider.files
   end
 end
-end
+end

data/lib/gpm/target/deb.rb

@@ -40,10 +40,6 @@ class Target::Deb < Target::Base
       @logger = create_logger
     end
 
-    def permission_overrides
-      { Regexp.union(POST_INST_FILES, PRE_RM_FILES) => SCRIPT_PERMISSIONS }
-    end
-
     def name
       clean_package_name(__getobj__.name)
     end
@@ -116,6 +112,10 @@ class Target::Deb < Target::Base
     def type
       "deb"
     end
+    private
+    def permission_overrides
+      { Regexp.union(POST_INST_FILES, PRE_RM_FILES) => SCRIPT_PERMISSIONS }
+    end
   end
 
   def all_binaries

data/lib/gpm/target/generate_from_templates.rb

@@ -48,7 +48,6 @@ module GenerateFromTemplates
 
   def file_content(template, source, file)
     contents = template.result(source.instance_eval{ binding() })
-    basename = File.basename(file)
     if file.end_with?(".gz")
       zipped = ""
       gz = Zlib::GzipWriter.new(StringIO.new(zipped))
@@ -59,4 +58,4 @@ module GenerateFromTemplates
     contents
   end
 
-end
+end

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

@@ -20,8 +20,9 @@ Standards-Version: 3.9.1
 Section: <%= category or "unknown" %>
 Priority: extra
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
-<% lines = (description or "no description given").split("\n") -%>
-<% firstline, *remainder = lines -%>
+<% use_default = (description.nil? or description =~ /\A\s*\Z/)
+   lines = (use_default ? "no description given" : description).split("\n")
+   firstline, *remainder = lines -%>
 Description: <%= firstline %>
 <% if remainder.any? -%>
 <%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &76972990 !ruby/object:Gem::Requirement
+  requirement: &73079020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76972990
+  version_requirements: *73079020
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &76972540 !ruby/object:Gem::Requirement
+  requirement: &73078640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *76972540
+  version_requirements: *73078640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76972240 !ruby/object:Gem::Requirement
+  requirement: &73078380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76972240
+  version_requirements: *73078380
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &76972050 !ruby/object:Gem::Requirement
+  requirement: &73078180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76972050
+  version_requirements: *73078180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &76971730 !ruby/object:Gem::Requirement
+  requirement: &73077900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *76971730
+  version_requirements: *73077900
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &76971420 !ruby/object:Gem::Requirement
+  requirement: &73077650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *76971420
+  version_requirements: *73077650
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &76971130 !ruby/object:Gem::Requirement
+  requirement: &73077420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *76971130
+  version_requirements: *73077420
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &76970850 !ruby/object:Gem::Requirement
+  requirement: &73077180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *76970850
+  version_requirements: *73077180
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &76970570 !ruby/object:Gem::Requirement
+  requirement: &73076950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *76970570
+  version_requirements: *73076950
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &76970290 !ruby/object:Gem::Requirement
+  requirement: &73076710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *76970290
+  version_requirements: *73076710
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &76970030 !ruby/object:Gem::Requirement
+  requirement: &73076480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *76970030
+  version_requirements: *73076480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &76969780 !ruby/object:Gem::Requirement
+  requirement: &73076230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *76969780
+  version_requirements: *73076230
 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!