imagemaster3000 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12db545fdb2c945fe2078f75e7696a5780fd0bb6
-  data.tar.gz: 24ee73c3e748685d9c2636513ef3aff92ee29fb1
+  metadata.gz: 706709ff8db7e68916455fdcf0546dc7ede63310
+  data.tar.gz: ec12cdd3da410ec605a07fd52e3eaf098fff4133
 SHA512:
-  metadata.gz: d3195e4a60c431c3fdb77c29831f5e6037869e2048eabd4434bb95f834c1b81d4f8ab1e734ea6e870bbb48c75f3def12a968517fca860193cd017bd91912fb77
-  data.tar.gz: def7039b704391b18c49a0b1add5517b4f08ed1ebaa058051b3d1f44ef8678f745737502150491ab25f8b93f24c01b35f87adeae209fe4a197a267d8dec881c2
+  metadata.gz: 575d4700bc20c4a01fb3256d6e37c9b6d0107f2508f6013c89871920876239b88b860ebd8adc3baed1b82822ffe8de56407e4fe6f78bd7d5101d09e44241f863
+  data.tar.gz: 7fb0e0e92515b2a699bcd7c0f7410d8fe8f861d9479ddfb3e97d96af9761b6a637a3f6f3f05139932093d50994f80107c6e553e084416d214426d8741eba8876

data/.circleci/config.yml

@@ -6,25 +6,28 @@ jobs:
         - /.*/
     docker:
       - image: docker:stable
-    working_directory: /root/imagemaster3000
+    working_directory: /root/working_directory
     steps:
       - run: apk add --no-cache git openssh
       - checkout
       - setup_remote_docker
+      - run: |
+          git config --global --replace-all versionsort.prereleasesuffix ".alpha"
+          git config --global --add versionsort.prereleasesuffix ".beta"
       - run: |
           TAG=${CIRCLE_TAG#v}
           BRANCH=${TAG/%.*/.x}
           VERSION=${TAG}
-          LATEST=$(git tag --sort=-refname | head -n 1)
+          LATEST=$(git tag --sort=-version:refname | head -n 1)
 
           docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-          docker build --build-arg branch=$BRANCH --build-arg version="$VERSION" -t misenko/imagemaster3000:$TAG .
-          docker push misenko/imagemaster3000:$TAG
+          docker build --build-arg branch=$BRANCH --build-arg version="$VERSION" -t $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:$TAG ./$DOCKERFILE_DIR
+          docker push $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:$TAG
 
           if [ "$LATEST" == "$CIRCLE_TAG" ]; then
-            docker tag misenko/imagemaster3000:$TAG misenko/imagemaster3000:latest
-            docker push misenko/imagemaster3000:latest
+            docker tag $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:$TAG $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:latest
+            docker push $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:latest
           fi
 deployment:
   fake_deploy_for_cci2:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.2
   Exclude:
     - 'vendor/**/*'
 
@@ -22,6 +22,10 @@ Metrics/AbcSize:
 Style/Documentation:
   Enabled: false
 
+Style/MixinUsage:
+  Exclude:
+    - 'lib/imagemaster3000/entities/image.rb'
+
 RSpec/MultipleExpectations:
   Enabled: false
 

data/imagemaster3000.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'imagemaster3000/version'
@@ -20,24 +18,24 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rubocop', '~> 0.48'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
   spec.add_development_dependency 'simplecov', '~> 0.12'
-  spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
 
-  spec.add_runtime_dependency 'thor', '~> 0.19'
-  spec.add_runtime_dependency 'yell', '~> 2.0'
-  spec.add_runtime_dependency 'settingslogic', '~> 2.0'
   spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 6.0'
-  spec.add_runtime_dependency 'tilt', '~> 2.0'
+  spec.add_runtime_dependency 'git', '~> 1.3'
   spec.add_runtime_dependency 'gpgme', '~> 2.0'
-  spec.add_runtime_dependency 'mixlib-shellout', '~> 2.2'
   spec.add_runtime_dependency 'json-schema', '~> 2.8'
-  spec.add_runtime_dependency 'git', '~> 1.3'
+  spec.add_runtime_dependency 'mixlib-shellout', '~> 2.2'
+  spec.add_runtime_dependency 'settingslogic', '~> 2.0'
+  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'tilt', '~> 2.0'
+  spec.add_runtime_dependency 'yell', '~> 2.0'
 
   spec.required_ruby_version = '>= 2.2.0'
 end

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

@@ -14,6 +14,7 @@
           "dc:identifier":"<%= image.name %>",
           "ad:mpuri":"<%= Imagemaster3000::Settings[:'image-list-mpuri'] %>",
           "dc:title":"<%= image.name %>",
+          "dc:date:expires":"<%= (Time.now + 6.months).strftime('%Y-%m-%dT%H:%M:%SZ') %>",
           "hv:hypervisor":"QEMU-KVM",
 <% if image.ram -%>
           "hv:ram_minimum": "<%= image.ram %>",

data/lib/imagemaster3000/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagemaster3000
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -137,35 +137,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: yell
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: settingslogic
+  name: gpgme
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -179,41 +185,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: gpgme
+  name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -227,47 +227,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: yell
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 description: Downloading and slight modification of cloud images
 email:
 - kimle.michal@gmail.com
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Downloading and slight modification of cloud images