imagemaster3000 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996e77fb0c4428397770762578ac29cdc1dae5a3
-  data.tar.gz: 7f2951d4136f4131e02b69040054accdf66654f7
+  metadata.gz: aca6a562b884c32fe727aea3f82fd5d4ff370524
+  data.tar.gz: 2f95e621cee42e6cfa9886672173dd4bf85fe18a
 SHA512:
-  metadata.gz: 66df3e15cfba256c630f5504341a369ae04df60878a2acf5af4a7407bcf16e1f3fc46ad830a768eaf680b6d6b7eef49e0818d43290fcc778e137037f4fd15042
-  data.tar.gz: ecdad85ef7c738b2377f012f3d4dd59cb8aadd106a7e140b2fa9e6bb0c84ef7b76531c6bd51f82bb6c04269175819ec1a97c8bf001c65993e79cae14ed140e4b
+  metadata.gz: 882f848abfc0e3a7dc4194e90ccab8149f04902e87ed64d1405ca66f46ed6350262d36369f89500d9ac7e531f6a09eca20fb5ca2e86e7c72832a35f8ac67de93
+  data.tar.gz: cce26a9e491ad3067d5cec5a7ac20187ad51d0895a2c75e3f3dc967e4df1327fef8b079e285cdbf2a9fb1193834341c16d06087f0a8b8e9b7660d461c14f32ae

data/config/imagemaster3000.yml

@@ -1,5 +1,7 @@
 imagemaster3000:
-  definitions-git-repo: # Definitions in this git repository are used to download and modify images
+  definitions:
+    repository: # Repository from which image definitions will be downloaded
+    branch: # Repository branch that will be used
   image-dir: /var/spool/imagemaster3000/ # Directory where to temporarily store images
   image-list: /var/spool/imagemaster3000/imagemaster3000.list # Name and path of generated image list
   endpoint: http://localhost/ # Endpoint where image list will be available

data/lib/imagemaster3000/cli.rb

@@ -17,11 +17,15 @@ module Imagemaster3000
                  type: :boolean,
                  desc: 'Runs in debug mode'
 
-    method_option :'definitions-git-repo',
-                  default: Imagemaster3000::Settings['definitions-git-repo'],
+    method_option :'definitions-repository',
+                  default: Imagemaster3000::Settings['definitions']['repository'],
                   type: :string,
                   required: true,
-                  desc: 'Definitions in this git repository are used to download and modify images'
+                  desc: 'Repository from which image definitions will be downloaded'
+    method_option :'definitions-branch',
+                  default: Imagemaster3000::Settings['definitions']['branch'],
+                  type: :string,
+                  desc: 'Repository branch that will be used'
     method_option :'image-dir',
                   default: Imagemaster3000::Settings['image-dir'],
                   type: :string,

data/lib/imagemaster3000/definitions/downloader.rb

@@ -4,19 +4,12 @@ require 'tmpdir'
 module Imagemaster3000
   module Definitions
     class Downloader
-      def initialize(git_repository)
-        @dir = Dir.mktmpdir 'imagemaster3000-'
-        logger.debug "Downloading definitions repository #{git_repository}"
-        @git = Git.clone(git_repository, 'definitions', path: @dir)
-      end
-
-      def path
-        @git.dir.path
-      end
-
-      def clean
-        logger.debug "Cleaning definitions #{@dir}"
-        FileUtils.remove_entry @dir
+      def self.download_definitions
+        tmp_dir = Dir.mktmpdir 'imagemaster3000-'
+        logger.debug "Downloading definitions repository #{Imagemaster3000::Settings['definitions-repository']}"
+        Imagemaster3000::Entities::Definitions.new(Git.clone(Imagemaster3000::Settings['definitions-repository'],
+                                                             File.basename(tmp_dir),
+                                                             path: File.dirname(tmp_dir)))
       end
     end
   end

data/lib/imagemaster3000/entities/definitions.rb

@@ -0,0 +1,27 @@
+module Imagemaster3000
+  module Entities
+    class Definitions
+      def initialize(repository)
+        @repository = repository
+
+        self.branch = Imagemaster3000::Settings['definitions-branch'] if Imagemaster3000::Settings['definitions-branch']
+      end
+
+      def path
+        @repository.dir.path
+      end
+
+      def branch=(branch)
+        raise Imagemaster3000::Errors::ArgumentError, "no such branch #{branch.inspect}" unless @repository.is_branch? branch
+
+        logger.debug "Changing branch to #{branch}"
+        @repository.checkout branch
+      end
+
+      def clean
+        logger.debug "Cleaning definitions #{@directory}"
+        FileUtils.remove_entry path
+      end
+    end
+  end
+end

data/lib/imagemaster3000/entities.rb

@@ -2,5 +2,6 @@ module Imagemaster3000
   module Entities
     autoload :Image, 'imagemaster3000/entities/image'
     autoload :Downloadable, 'imagemaster3000/entities/downloadable'
+    autoload :Definitions, 'imagemaster3000/entities/definitions'
   end
 end

data/lib/imagemaster3000/main_process.rb

@@ -9,15 +9,14 @@ module Imagemaster3000
       generate_image_list
       Imagemaster3000::Cleaner.clean
     ensure
-      Imagemaster3000::Cleaner.write_clean_file images.map(&:local_filename)
-      definitions.clean
+      Imagemaster3000::Cleaner.write_clean_file images.map(&:local_filename) if images
+      definitions.clean if definitions
     end
 
     private
 
     def process_definitions
-      logger.debug "Download definitions from #{Imagemaster3000::Settings['definitions-git-repo'].inspect}"
-      @definitions = Imagemaster3000::Definitions::Downloader.new Imagemaster3000::Settings['definitions-git-repo']
+      @definitions = Imagemaster3000::Definitions::Downloader.download_definitions
       Imagemaster3000::Settings['definitions-dir'] = definitions.path
       logger.debug 'Loading images from definitions'
       @images = Imagemaster3000::Definitions::Parser.parse_image_definitions

data/lib/imagemaster3000/version.rb

@@ -1,3 +1,3 @@
 module Imagemaster3000
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagemaster3000
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,7 @@ files:
 - lib/imagemaster3000/definitions/parser.rb
 - lib/imagemaster3000/definitions/schemas/imagemaster3000-definition-schema.json
 - lib/imagemaster3000/entities.rb
+- lib/imagemaster3000/entities/definitions.rb
 - lib/imagemaster3000/entities/downloadable.rb
 - lib/imagemaster3000/entities/image.rb
 - lib/imagemaster3000/errors.rb