imagemaster3000 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf21239434489d0785772c0c87d1196e59fa578
-  data.tar.gz: 35416c5698f997f32cdfc489b7f6153e089d2bb8
+  metadata.gz: f9ddf76551e39e0d2564d060fcf9a142b8462c7c
+  data.tar.gz: 7cd13f3d108660e57a4857aae1ec89648260d897
 SHA512:
-  metadata.gz: 2fa58029147e0421d4df10c15ea5af35ecf9f7be1a2e31ef35f98a3ee67a5dada1a8fe3985bff35323bbd70e7c0390baf495ef5f79cd390a57a1c6b871b67c65
-  data.tar.gz: 8754773e67451563527d37f811cc30711ac1a9ea275be2cd95baeda66871cc29b4180998d34043bcf0077276cfa04b4dc24abeb214a6e78bcb433369b4301fa1
+  metadata.gz: 10fd45c4b7c924ee7b6550223461bfb44455bbf284fb7987273035100edf2ad2e2eb825687c9a2443637678cb686831df53f40a14eaad53536ac427c7ba2ea17
+  data.tar.gz: 0a056a01e1e64cbf82acf53c153836b99d9bbc160e2ffd357d6a3d08e6839f5c76b77cbbc21d42d58ce9c4a691b7e1b05d55f09d82db3337af5e660f4691578d

data/lib/imagemaster3000.rb

@@ -4,6 +4,7 @@ require 'gpgme'
 module Imagemaster3000
   autoload :CLI, 'imagemaster3000/cli'
   autoload :Settings, 'imagemaster3000/settings'
+  autoload :Cleaner, 'imagemaster3000/cleaner'
   autoload :MainProcess, 'imagemaster3000/main_process'
 
   autoload :Errors, 'imagemaster3000/errors'

data/lib/imagemaster3000/cleaner.rb

@@ -0,0 +1,25 @@
+module Imagemaster3000
+  class Cleaner
+    CLEAN_FILE = File.join(Imagemaster3000::Settings[:'image-dir'], 'clean.list')
+
+    class << self
+      def clean
+        return unless File.exist? CLEAN_FILE
+
+        logger.debug 'Cleaning old images'
+        files = File.read(CLEAN_FILE).lines.map(&:strip)
+        files.each do |file|
+          logger.debug "Removing file #{file.inspect}"
+          File.delete file if File.exist? file
+        end
+        File.delete CLEAN_FILE
+      end
+
+      def write_clean_file(files)
+        clean_data = files.join("\n").concat("\n")
+        logger.debug "Writing clean file, new data:\n#{clean_data}"
+        File.write CLEAN_FILE, clean_data, mode: 'a'
+      end
+    end
+  end
+end

data/lib/imagemaster3000/entities/downloadable.rb

@@ -7,11 +7,12 @@ module Imagemaster3000
         logger.debug "Downloading image from #{url.inspect}"
 
         uri = URI.parse url
-        filename = generate_filename(uri)
+        filename = generate_filename
+        @local_filename = filename
+        @remote_filename = File.basename(uri.path)
         retrieve_image(uri, filename)
 
         logger.debug "Image from #{url.inspect} was saved as #{filename.inspect}"
-        @file = filename
         @size = File.size filename
       rescue ::URI::InvalidURIError, ::IOError => ex
         raise Imagemaster3000::Errors::DownloadError, ex
@@ -39,8 +40,8 @@ module Imagemaster3000
         raise Imagemaster3000::Errors::DownloadError, ex
       end
 
-      def generate_filename(uri)
-        File.join(Imagemaster3000::Settings[:'image-dir'], File.basename(uri.path))
+      def generate_filename
+        File.join(Imagemaster3000::Settings[:'image-dir'], SecureRandom.hex)
       end
     end
   end

data/lib/imagemaster3000/entities/image.rb

@@ -3,7 +3,7 @@ module Imagemaster3000
     class Image
       include Downloadable
 
-      attr_accessor :name, :url, :distribution, :version, :ram, :cpu, :actions, :verification, :file, :size
+      attr_accessor :name, :url, :distribution, :version, :ram, :cpu, :actions, :verification, :local_filename, :remote_filename, :size
 
       def initialize(name: nil, url: nil, distribution: nil, version: nil, ram: nil, cpu: nil, actions: nil, verification: nil)
         raise Imagemaster3000::Errors::ArgumentError, 'name, url, distribution or version cannot be nil' \

data/lib/imagemaster3000/image_list/templates/image_list.erb

@@ -24,7 +24,7 @@
 <% end -%>
           "hv:format":"qcow2",
           "hv:size":"<%= image.size %>",
-          "hv:uri":"<%= File.join(Imagemaster3000::Settings[:endpoint], File.basename(image.file)) %>",
+          "hv:uri":"<%= File.join(Imagemaster3000::Settings[:endpoint], File.basename(image.local_filename)) %>",
           "hv:version":"<%= image.version %>",
 <% if image.verification -%>
           "sl:checksum:sha512":"<%= image.verification[:hash][:checksum] %>",

data/lib/imagemaster3000/main_process.rb

@@ -9,6 +9,9 @@ module Imagemaster3000
       logger.debug 'Generating image list'
       image_list = Imagemaster3000::ImageList::Signer.sign(Imagemaster3000::ImageList::Generator.generate(images))
       File.write Imagemaster3000::Settings[:'image-list'], image_list
+      Imagemaster3000::Cleaner.clean
+    ensure
+      Imagemaster3000::Cleaner.write_clean_file images.map(&:local_filename)
     end
 
     private
@@ -16,7 +19,7 @@ module Imagemaster3000
     def process_image(image)
       image.download
       image.verify! if image.respond_to? :verify!
-      image.actions.each { |action| action.run image.file } unless image.actions.blank?
+      image.actions.each { |action| action.run image.local_filename } unless image.actions.blank?
     end
   end
 end

data/lib/imagemaster3000/verification/hash.rb

@@ -4,15 +4,15 @@ module Imagemaster3000
       def verify_hash!
         logger.debug 'Verifying checksum'
         checksum = find_checksum!
-        computed_checksum = verification[:hash][:function].file(file).hexdigest
+        computed_checksum = verification[:hash][:function].file(local_filename).hexdigest
 
         if checksum == computed_checksum
-          verification[:hash][:checksum] = ::Digest::SHA512.file(file).hexdigest
+          verification[:hash][:checksum] = ::Digest::SHA512.file(local_filename).hexdigest
           return
         end
 
         raise Imagemaster3000::Errors::VerificationError,
-              "Checksum mismatch for file #{file}: expected: #{checksum}, was: #{computed_checksum}"
+              "Checksum mismatch for file #{local_filename}: expected: #{checksum}, was: #{computed_checksum}"
       end
 
       private
@@ -23,7 +23,7 @@ module Imagemaster3000
 
       def find_checksum_line
         checksum_list = verification[:hash][:list]
-        filename = File.basename(file)
+        filename = remote_filename
 
         logger.debug "Looking for filename #{filename.inspect} in list \n#{checksum_list}"
 
@@ -32,7 +32,7 @@ module Imagemaster3000
           unless found_lines.count == 1
 
         checksum_line = found_lines.first
-        logger.debug "Found mathcing line #{checksum_line.inspect}"
+        logger.debug "Found matching line #{checksum_line.inspect}"
 
         checksum_line
       end

data/lib/imagemaster3000/version.rb

@@ -1,3 +1,3 @@
 module Imagemaster3000
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagemaster3000
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,6 +288,7 @@ files:
 - lib/imagemaster3000/actions.rb
 - lib/imagemaster3000/actions/copy.rb
 - lib/imagemaster3000/actions/remove.rb
+- lib/imagemaster3000/cleaner.rb
 - lib/imagemaster3000/cli.rb
 - lib/imagemaster3000/definitions.rb
 - lib/imagemaster3000/definitions/parser.rb