puppet-magnum 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b015672f5b4db9b907a5bb7a8f5419cdae37b3d
-  data.tar.gz: 63b332f85916dd09797e2c0d457fc5687f72e0c9
+  metadata.gz: a030e0c24caedcd5eff49e87bb83756ecef462e8
+  data.tar.gz: 15b277f93c5f95517b7090d836c8ee308a2e89a3
 SHA512:
-  metadata.gz: 8815217c5be4c6cda765e332c2e5f7fdb67311f0eab8374b19f650c8987e2e3aa71ad408039683bb83779dbd903105c49491c6ca919d0751747ff0163c7728df
-  data.tar.gz: be67eff63cca1d8fdbdb3da35e2be7af9e6daa4c657c87d529f22d078cb12b151a6af514b495539730ee4aba167a766cd1888b62a2e2e1ea1d735ef87d59c75b
+  metadata.gz: 6ed50a6d3674ceb5634cf85c19aee46e345a61424fa575fd3d176d19c4781654ab05c3f655efbec29a74a073b16eb81040b4f00ddffcaac086f95bfdd0150f4d
+  data.tar.gz: 982712d91e32b13cd3cdb4a887f6844df88c8720e4b96c014192e50eefd4f5048b5f3059ff61d0b0f339c9664fc92b27d7f7b0f307cf8909b1631dc2e887c813

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [4.0.2]
+
+### IMPROVEMENTS:
+
+  * Added a function to remove any unused files and directories in `puppet-magnum` 4.x.
+    This will make upgrading PM repos from 3.x to 4.x easier.
+    A `module init` using `puppet-magnum` 4.x will remove/rename the following files:
+      - .fixtures.yml (removed)
+      - .vagrant_puppet/ (removed)
+      - Vagrantfile (removed)
+      - spec => spec.old (renamed)
+      - serverspec => serverspec.old (renamed)
+
 ## [4.0.1]
 
 ### IMPROVEMENTS:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet-magnum (4.0.1)
+    puppet-magnum (4.0.2)
       beaker-hostgenerator (~> 0.8.4)
       bundler (>= 1.14.6)
       puppet (~> 4.10.0)

data/VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

data/generator_files/puppet/common.yaml.erb

@@ -1,2 +1,2 @@
 ---
-<%= module_name %>::test_message: "foobar"
+<%= module_name %>::test_message: "example"

data/generator_files/util/puppet-magnum.erb

@@ -0,0 +1,4 @@
+---
+# puppet-magnum init file
+  version: <%= puppet_magnum_init_version %>
+  date: <%= puppet_magnum_init_date %>

data/lib/puppet-magnum.rb

@@ -2,12 +2,17 @@ require 'thor'
 require 'pathname'
 
 module PuppetMagnum
-  autoload :BaseGenerator,      'puppet-magnum/generators/base_generator'
-  autoload :CreateGenerator,    'puppet-magnum/generators/create_generator'
+
   autoload :Cli,                'puppet-magnum/cli'
   autoload :Module,             'puppet-magnum/cli/module'
 
+  autoload :Verify,             'puppet-magnum/utility/verify'
+
+  autoload :BaseGenerator,      'puppet-magnum/generators/base_generator'
+  autoload :CreateGenerator,    'puppet-magnum/generators/create_generator'
+
   def self.root
     @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
   end
+
 end

data/lib/puppet-magnum/cli/module.rb

@@ -14,6 +14,11 @@ module PuppetMagnum
       PuppetMagnum::CreateGenerator.new([File.join(Dir.pwd, module_name), module_name], options).invoke_all
     end
 
+    desc 'verify [MODULE_NAME]', 'Verifies the Puppet module.'
+    def verify(module_name)
+      PuppetMagnum::Verify.new([File.join(Dir.pwd, module_name), module_name], options).invoke_all
+    end
+
     def self.banner(task, namespace = false, subcommand = true)
       "#{basename} #{task.formatted_usage(self, namespace, subcommand).split(':').join(' ')}"
     end

data/lib/puppet-magnum/generators/create_generator.rb

@@ -20,6 +20,30 @@ module PuppetMagnum
     class_option :copyright_holder,
       type: :string
 
+    # first, remove ANY unused legacy files and directories.
+    # (migration function from `puppet-magnum` 3.x to 4.x)
+    def write_remove_legacy_files_dirs
+      if File.exist?(target.join('.puppet-magnum.init'))
+
+        legacy_files = ['.fixtures.yml', '.vagrant_puppet', 'Vagrantfile']
+        legacy_files.each do |legacy_file|
+          if File.exist?(target.join("#{legacy_file}"))
+            remove_file target.join("#{legacy_file}")
+          end
+        end
+
+        legacy_dirs = ['spec', 'serverspec']
+        legacy_dirs.each do |legacy_dir|
+          if File.exist?(target.join("#{legacy_dir}"))
+            directory target.join("#{legacy_dir}"), target.join("#{legacy_dir}.old")
+            remove_file target.join("#{legacy_dir}")
+          end
+        end
+
+        remove_file target.join('.puppet-magnum.init')
+      end
+    end
+
     def write_dirs
       dirs = ['manifests', 'data', 'templates', 'files',
               'spec', 'spec/acceptance', 'spec/acceptance/nodesets', 'spec/acceptance/nodesets/docker',
@@ -36,6 +60,16 @@ module PuppetMagnum
       template 'base/CHANGELOG.md.erb', target.join('CHANGELOG.md')
     end
 
+    def write_util_files
+      remove_file target.join('Gemfile')
+      remove_file target.join('Rakefile')
+      remove_file target.join('.puppet-magnum')
+
+      template 'util/Gemfile.erb', target.join('Gemfile')
+      template 'util/Rakefile.erb', target.join('Rakefile')
+      template 'util/puppet-magnum.erb', target.join('.puppet-magnum')
+    end
+
     def write_puppet_files
       template 'puppet/metadata.json.erb', target.join('metadata.json')
       template 'puppet/init.pp.erb',       target.join('manifests/init.pp')
@@ -50,7 +84,11 @@ module PuppetMagnum
       # beaker test files
       template 'spec/acceptance/spec_helper_acceptance.rb.erb', target.join('spec/spec_helper_acceptance.rb')
 
-      beaker_sut_files = ['ubuntu-server-1404-x64.yml', 'ubuntu-server-1604-x64.yml']
+      beaker_sut_files = [
+        'ubuntu-server-1404-x64.yml',
+        'ubuntu-server-1604-x64.yml',
+      ]
+
       beaker_sut_files.each do |beaker_sut_file|
         # VirtualBox
         template "spec/acceptance/#{beaker_sut_file}.erb", target.join("spec/acceptance/nodesets/#{beaker_sut_file}")
@@ -59,17 +97,7 @@ module PuppetMagnum
       end
     end
 
-    def write_util_files
-      remove_file target.join('Gemfile')
-      remove_file target.join('Rakefile')
-      remove_file target.join('.puppet-magnum.init')
-
-      template 'util/Gemfile.erb', target.join('Gemfile')
-      template 'util/Rakefile.erb', target.join('Rakefile')
-      template 'util/puppet-magnum.init.erb', target.join('.puppet-magnum.init')
-    end
-
-    # due to the 'git add' operation, this function should be called last
+    # due to the 'git add' operation, this function should be called last.
     def write_git_setup
       remove_file target.join('.gitignore')
       template 'git/gitignore.erb', target.join('.gitignore')
@@ -124,8 +152,12 @@ module PuppetMagnum
       options[:copyright_holder] || maintainer
     end
 
-    def puppet_magnum_init_timestamp
-      "puppet-magnum (#{PuppetMagnum::VERSION.chomp}) last initialized this Puppet module directory on #{Time.now.ctime}."
+    def puppet_magnum_init_date
+      Time.now.ctime
+    end
+
+    def puppet_magnum_init_version
+      PuppetMagnum::VERSION.chomp
     end
 
     def default_options

data/lib/puppet-magnum/utility/verify.rb

@@ -0,0 +1,23 @@
+require 'pathname'
+
+module PuppetMagnum
+  class Verify < Thor::Group
+
+    include Thor::Actions
+    include Thor::Shell
+
+    argument :path,        type: :string, required: true
+    argument :module_name, type: :string, required: true
+
+    def verify_module
+      # FIXME
+    end
+
+    private
+
+    def target
+      @target ||= Pathname.new(File.expand_path(path))
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-magnum
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Tehmasp Chaudhri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sem_ver
@@ -204,12 +204,13 @@ files:
 - generator_files/spec/rspec.erb
 - generator_files/util/Gemfile.erb
 - generator_files/util/Rakefile.erb
-- generator_files/util/puppet-magnum.init.erb
+- generator_files/util/puppet-magnum.erb
 - lib/puppet-magnum.rb
 - lib/puppet-magnum/cli.rb
 - lib/puppet-magnum/cli/module.rb
 - lib/puppet-magnum/generators/base_generator.rb
 - lib/puppet-magnum/generators/create_generator.rb
+- lib/puppet-magnum/utility/verify.rb
 - lib/puppet-magnum/version.rb
 - puppet-magnum.gemspec
 - spec/lib/puppet-magnum/cli_spec.rb

data/generator_files/util/puppet-magnum.init.erb

@@ -1 +0,0 @@
-<%= puppet_magnum_init_timestamp %>