imagemaster3000 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706709ff8db7e68916455fdcf0546dc7ede63310
-  data.tar.gz: ec12cdd3da410ec605a07fd52e3eaf098fff4133
+  metadata.gz: 61e5dc4473085611c7b91bb0308463f307f660ee
+  data.tar.gz: d4f951f7dede795722204617023a45bcf68a6b0d
 SHA512:
-  metadata.gz: 575d4700bc20c4a01fb3256d6e37c9b6d0107f2508f6013c89871920876239b88b860ebd8adc3baed1b82822ffe8de56407e4fe6f78bd7d5101d09e44241f863
-  data.tar.gz: 7fb0e0e92515b2a699bcd7c0f7410d8fe8f861d9479ddfb3e97d96af9761b6a637a3f6f3f05139932093d50994f80107c6e553e084416d214426d8741eba8876
+  metadata.gz: f551c535fdf3b69d30b34bf07557a3812af67126a651ebcc35dab8e46975b1aded752e256d3ae7c981f9715802db9b2e459d79986ed4a56173e4113226bd232b
+  data.tar.gz: bf0a1b4734bb0c8923edbdbd11834530fd8d2b34dddb6cba3f73254622a0a516ac93ef22983bb7001d4f623f939190f60e02d43c266e20d03cf1fc0691fe44db

data/imagemaster3000.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'imagemaster3000/version'
 

data/lib/imagemaster3000/actions.rb

@@ -2,5 +2,6 @@ module Imagemaster3000
   module Actions
     autoload :Copy, 'imagemaster3000/actions/copy'
     autoload :Remove, 'imagemaster3000/actions/remove'
+    autoload :Link, 'imagemaster3000/actions/link'
   end
 end

data/lib/imagemaster3000/actions/link.rb

@@ -0,0 +1,35 @@
+module Imagemaster3000
+  module Actions
+    class Link
+      attr_accessor :target, :link, :symbolic
+
+      def initialize(target: nil, link: nil, symbolic: false)
+        raise Imagemaster3000::Errors::ArgumentError, 'neither target nor link can be nil' if target.empty? || link.empty?
+
+        @target = target
+        @link = link
+        @symbolic = symbolic
+        logger.debug "Created action #{inspect}"
+      end
+
+      def run(image_file)
+        logger.debug "Running 'link' action with target #{target.inspect} and link #{link.inspect} on file #{image_file.inspect}"
+        ln image_file
+      rescue Imagemaster3000::Errors::CommandExecutionError => ex
+        raise Imagemaster3000::Errors::ActionError, ex
+      end
+
+      def ln(image_file)
+        ln_command = symbolic ? 'ln-s' : 'ln'
+
+        Imagemaster3000::Utils::CommandExecutioner.execute Imagemaster3000::Settings[:'binaries-guestfish'],
+                                                           '-a',
+                                                           image_file,
+                                                           '-i',
+                                                           ln_command,
+                                                           target,
+                                                           link
+      end
+    end
+  end
+end

data/lib/imagemaster3000/definitions/schemas/imagemaster3000-definition-schema.json

@@ -20,6 +20,18 @@
       "title":"Name",
       "type":"string"
     },
+    "linkname":{
+      "description":"Link file",
+      "id":"#linkname",
+      "title":"Link",
+      "type":"string"
+    },
+    "symbolic":{
+      "description":"Whether created link should be symbolic",
+      "id":"#symbolic",
+      "title":"Symbolic",
+      "type":"boolean"
+    },
     "copy":{
       "additionalItems":false,
       "id":"#copy",
@@ -54,6 +66,30 @@
       },
       "type":"array"
     },
+    "link":{
+      "additionalItems":false,
+      "id":"#link",
+      "items":{
+        "additionalProperties":false,
+        "properties":{
+          "target":{
+            "$ref":"#/definitions/target"
+          },
+          "link":{
+            "$ref":"#/definitions/linkname"
+          },
+          "symbolic":{
+            "$ref":"#/definitions/symbolic"
+          }
+        },
+        "required":[
+          "target",
+          "link"
+        ],
+        "type":"object"
+      },
+      "type":"array"
+    },
     "actions":{
       "additionalProperties":false,
       "id":"#actions",
@@ -63,6 +99,9 @@
         },
         "remove":{
           "$ref":"#/definitions/remove"
+        },
+        "link":{
+          "$ref":"#/definitions/link"
         }
       },
       "type":"object"

data/lib/imagemaster3000/entities/downloadable.rb

@@ -32,7 +32,7 @@ module Imagemaster3000
             end
 
             response.value
-            open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
+            File.open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
           end
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,

data/lib/imagemaster3000/utils/tmp.rb

@@ -1,4 +1,3 @@
-require 'open-uri'
 require 'tempfile'
 
 module Imagemaster3000
@@ -6,8 +5,8 @@ module Imagemaster3000
     class Tmp
       def self.download(url)
         file = Tempfile.new('imagemaster3000')
-        download = open(url)
         logger.debug "Downloading file from url #{url} to tempfile #{file.path.inspect}"
+        download = URI.parse(url).open
         IO.copy_stream(download, file)
 
         file.rewind
@@ -15,6 +14,8 @@ module Imagemaster3000
       end
 
       def self.destroy(file)
+        return unless file
+
         logger.debug "Closing tempfile #{file.path.inspect}"
         file.close
         file.unlink

data/lib/imagemaster3000/version.rb

@@ -1,3 +1,3 @@
 module Imagemaster3000
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagemaster3000
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -293,6 +293,7 @@ files:
 - lib/imagemaster3000.rb
 - lib/imagemaster3000/actions.rb
 - lib/imagemaster3000/actions/copy.rb
+- lib/imagemaster3000/actions/link.rb
 - lib/imagemaster3000/actions/remove.rb
 - lib/imagemaster3000/cleaner.rb
 - lib/imagemaster3000/cli.rb