pkgr 1.5.1 → 1.6.0

data/lib/pkgr/env.rb

@@ -1,13 +1,20 @@
+require 'pkgr/env_value'
+
 module Pkgr
   class Env
     attr_reader :variables
 
+    def self.from_export(file)
+      new(File.read(file).split("\n").map { |line| line.sub(/^export\s+/, "") })
+    end
+
     def initialize(variables = nil)
       @variables = variables || []
+      @variables.compact!
     end
 
     def to_s
-      to_hash.map {|k, v| " #{k}=#{v}" }.join
+      to_hash.map{|k, v| [k, v.quote].join("=")}.join(" ")
     end
 
     def present?
@@ -23,13 +30,12 @@ module Pkgr
     end
 
     private
-
     def create_env_hash_from_string
       return {} if variables == []
 
       variables.inject({}) do |h, var|
-        name, value = var.split('=')
-        h[name.strip] = value.strip
+        name, value = var.split('=', 2)
+        h[name.strip] = EnvValue.new(value || "").strip.unquote
         h
       end
     end

data/lib/pkgr/env_value.rb

@@ -0,0 +1,55 @@
+class EnvValue < String
+  def quote(type=:double, count=nil)
+    if Integer === type
+      tmp   = count
+      count = type
+      type  = tmp || :mixed
+    else
+      count ||= 1
+    end
+
+    type = type.to_s unless Integer===type
+
+    case type
+    when "'", 'single', 's', 1
+      f = "'" * count
+      b = f
+    when '"', 'double', 'd', 2
+      f = '"' * count
+      b = f
+    when '`', 'back', 'b', -1
+      f = '`' * count
+      b = f
+    when "`'", 'bracket', 'sb'
+      f = "`" * count
+      b = "'" * count
+    when "'\"", 'mixed', "m", Integer
+      c = (count.to_f / 2).to_i
+      f = '"' * c
+      b = f
+      if count % 2 != 0
+        f = "'" + f
+        b = b + "'"
+      end
+    else
+      raise ArgumentError, "unrecognized quote type -- #{type}"
+    end
+    "#{f}#{self}#{b}"
+  end
+
+  def unquote
+    s = self.dup
+
+    case self[0,1]
+    when "'", '"', '`'
+      s[0] = ''
+    end
+
+    case self[-1,1]
+    when "'", '"', '`'
+      s[-1] = ''
+    end
+
+    return s
+  end
+end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 description: Simplify the deployment of your applications by automatically packaging
   your application and its dependencies on multiple platforms.
 email:
@@ -135,6 +135,7 @@ files:
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
 - data/buildpacks/debian-8
+- data/buildpacks/debian-9
 - data/buildpacks/fedora-20
 - data/buildpacks/sles-11
 - data/buildpacks/sles-12
@@ -185,6 +186,7 @@ files:
 - lib/pkgr/distributions/sles.rb
 - lib/pkgr/distributions/ubuntu.rb
 - lib/pkgr/env.rb
+- lib/pkgr/env_value.rb
 - lib/pkgr/fpm_command.rb
 - lib/pkgr/git.rb
 - lib/pkgr/installer.rb
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,9 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Package any Ruby, NodeJS or Go app as a deb or rpm package
 test_files: []
-has_rdoc: