pdk 1.2.1 → 1.3.0

data/lib/pdk/tests/unit.rb

@@ -6,9 +6,10 @@ require 'json'
 module PDK
   module Test
     class Unit
-      def self.cmd(_tests, opts = {})
-        # TODO: test selection
-        opts.key?(:parallel) ? 'parallel_spec' : 'spec'
+      def self.cmd(tests, opts = {})
+        rake_args = opts.key?(:parallel) ? 'parallel_spec' : 'spec'
+        rake_args += "[#{tests}]" unless tests.nil?
+        rake_args
       end
 
       def self.rake_bin
@@ -30,8 +31,8 @@ module PDK
 
       def self.parallel_with_no_tests?(ran_in_parallel, json_result, result)
         ran_in_parallel && json_result.empty? &&
-          !result[:exit_code].zero? &&
-          result[:stderr].strip =~ %r{Pass files or folders to run$}
+          ((!result[:exit_code].zero? && result[:stderr].strip =~ %r{Pass files or folders to run$}) ||
+           result[:stderr].strip =~ %r{No files for parallel_spec to run against$})
       end
 
       def self.print_failure(result, exception)
@@ -199,7 +200,7 @@ module PDK
         else
           examples = []
           rspec_json['examples'].each do |example|
-            examples << { id: example['id'], full_description: example['full_description'] }
+            examples << { file_path: example['file_path'], id: example['id'], full_description: example['full_description'] }
           end
           examples
         end

data/lib/pdk/util.rb

@@ -58,8 +58,13 @@ module PDK
     end
     module_function :package_install?
 
+    def development_mode?
+      !PDK::Util::Version.git_ref.nil?
+    end
+    module_function :development_mode?
+
     def gem_install?
-      !package_install?
+      !(package_install? || development_mode?)
     end
     module_function :gem_install?
 
@@ -166,5 +171,41 @@ module PDK
       end
     end
     module_function :targets_relative_to_pwd
+
+    def default_template_url
+      if !PDK.answers['template-url'].nil?
+        PDK.answers['template-url']
+      else
+        puppetlabs_template_url
+      end
+    end
+    module_function :default_template_url
+
+    def puppetlabs_template_url
+      if package_install?
+        'file://' + File.join(package_cachedir, 'pdk-templates.git')
+      else
+        'https://github.com/puppetlabs/pdk-templates'
+      end
+    end
+    module_function :puppetlabs_template_url
+
+    def default_template_ref
+      if !PDK.answers['template-ref'].nil?
+        PDK.answers['template-ref']
+      else
+        puppetlabs_template_ref
+      end
+    end
+    module_function :default_template_ref
+
+    def puppetlabs_template_ref
+      if PDK::Util.package_install? || PDK::Util.gem_install?
+        PDK::TEMPLATE_REF
+      else
+        'origin/master'
+      end
+    end
+    module_function :puppetlabs_template_ref
   end
 end

data/lib/pdk/util/bundler.rb

@@ -77,7 +77,7 @@ module PDK
           PDK.logger.debug(_('Checking for missing Gemfile dependencies.'))
 
           argv = ['check', "--gemfile=#{gemfile}"]
-          argv << "--path=#{bundle_cachedir}" if PDK::Util.gem_install?
+          argv << "--path=#{bundle_cachedir}" unless PDK::Util.package_install?
 
           result = bundle_command(*argv).execute!
 
@@ -104,7 +104,7 @@ module PDK
 
         def install!
           argv = ['install', "--gemfile=#{gemfile}", '-j4']
-          argv << "--path=#{bundle_cachedir}" if PDK::Util.gem_install?
+          argv << "--path=#{bundle_cachedir}" unless PDK::Util.package_install?
 
           command = bundle_command(*argv).tap do |c|
             c.add_spinner(_('Installing missing Gemfile dependencies.'))

data/lib/pdk/util/git.rb

@@ -0,0 +1,36 @@
+module PDK
+  module Util
+    module Git
+      def self.git_bindir
+        @git_dir ||= File.join('private', 'git', Gem.win_platform? ? 'cmd' : 'bin')
+      end
+
+      def self.git_paths
+        @paths ||= begin
+          paths = [File.join(PDK::Util.pdk_package_basedir, git_bindir)]
+
+          if Gem.win_platform?
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'mingw64', 'bin')
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'mingw64', 'libexec', 'git-core')
+            paths << File.join(PDK::Util.pdk_package_basedir, 'private', 'git', 'usr', 'bin')
+          end
+
+          paths
+        end
+      end
+
+      def self.git_bin
+        git_bin = Gem.win_platform? ? 'git.exe' : 'git'
+        vendored_bin_path = File.join(git_bindir, git_bin)
+
+        PDK::CLI::Exec.try_vendored_bin(vendored_bin_path, git_bin)
+      end
+
+      def self.git(*args)
+        PDK::CLI::Exec.ensure_bin_present!(git_bin, 'git')
+
+        PDK::CLI::Exec.execute(git_bin, *args)
+      end
+    end
+  end
+end

data/lib/pdk/util/version.rb

@@ -1,5 +1,6 @@
 require 'pdk/version'
 require 'pdk/cli/exec'
+require 'pdk/util/git'
 
 module PDK
   module Util
@@ -27,7 +28,7 @@ module PDK
 
         return nil unless File.directory?(source_git_dir)
 
-        ref_result = PDK::CLI::Exec.git('--git-dir', source_git_dir, 'describe', '--all', '--long')
+        ref_result = PDK::Util::Git.git('--git-dir', source_git_dir, 'describe', '--all', '--long')
         return ref_result[:stdout].strip if ref_result[:exit_code].zero?
       end
 

data/lib/pdk/validate.rb

@@ -1,6 +1,6 @@
-require 'pdk/validators/metadata_validator'
-require 'pdk/validators/puppet_validator'
-require 'pdk/validators/ruby_validator'
+require 'pdk/validate/metadata_validator'
+require 'pdk/validate/puppet_validator'
+require 'pdk/validate/ruby_validator'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/metadata/metadata_json_lint.rb

@@ -1,6 +1,6 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
+require 'pdk/validate/base_validator'
 require 'pdk/util/bundler'
 require 'pathname'
 

data/lib/pdk/{validators → validate}/metadata/metadata_syntax.rb

@@ -1,6 +1,6 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
+require 'pdk/validate/base_validator'
 require 'pathname'
 
 module PDK
@@ -21,7 +21,7 @@ module PDK
       end
 
       def self.create_spinner(targets = [], options = {})
-        return if PDK.logger.debug?
+        return unless PDK::CLI::Util.interactive?
         options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
         exec_group = options[:exec_group]

data/lib/pdk/{validators → validate}/metadata/task_metadata_lint.rb

@@ -1,6 +1,6 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
+require 'pdk/validate/base_validator'
 require 'pdk/util'
 require 'pathname'
 require 'json-schema'
@@ -25,7 +25,7 @@ module PDK
       end
 
       def self.create_spinner(targets = [], options = {})
-        return if PDK.logger.debug?
+        return unless PDK::CLI::Util.interactive?
         options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
         exec_group = options[:exec_group]
@@ -77,7 +77,7 @@ module PDK
 
         response.body
       rescue StandardError => e
-        raise PDK::CLI::FatalError, _('Unable to download Task Metadata Schema file. Please check internet connectivity and retry this action. %{error}') % { error: e }
+        raise PDK::CLI::FatalError, _('Unable to download Task Metadata Schema file. Check internet connectivity and retry this action. %{error}') % { error: e }
       end
 
       def self.invoke(report, options = {})

data/lib/pdk/{validators → validate}/metadata_validator.rb

@@ -1,9 +1,9 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
-require 'pdk/validators/metadata/metadata_json_lint'
-require 'pdk/validators/metadata/metadata_syntax'
-require 'pdk/validators/metadata/task_metadata_lint'
+require 'pdk/validate/base_validator'
+require 'pdk/validate/metadata/metadata_json_lint'
+require 'pdk/validate/metadata/metadata_syntax'
+require 'pdk/validate/metadata/task_metadata_lint'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/puppet/puppet_lint.rb

@@ -1,7 +1,7 @@
 require 'pdk'
 require 'pdk/util'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
+require 'pdk/validate/base_validator'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/puppet/puppet_syntax.rb

@@ -1,6 +1,6 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
+require 'pdk/validate/base_validator'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/puppet_validator.rb

@@ -1,8 +1,8 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
-require 'pdk/validators/puppet/puppet_lint'
-require 'pdk/validators/puppet/puppet_syntax'
+require 'pdk/validate/base_validator'
+require 'pdk/validate/puppet/puppet_lint'
+require 'pdk/validate/puppet/puppet_syntax'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/ruby/rubocop.rb

@@ -2,8 +2,8 @@ require 'pdk'
 require 'pdk/cli/exec'
 require 'pdk/util'
 require 'pdk/util/bundler'
-require 'pdk/validators/base_validator'
-require 'pdk/validators/ruby_validator'
+require 'pdk/validate/base_validator'
+require 'pdk/validate/ruby_validator'
 
 module PDK
   module Validate

data/lib/pdk/{validators → validate}/ruby_validator.rb

@@ -1,7 +1,7 @@
 require 'pdk'
 require 'pdk/cli/exec'
-require 'pdk/validators/base_validator'
-require 'pdk/validators/ruby/rubocop'
+require 'pdk/validate/base_validator'
+require 'pdk/validate/ruby/rubocop'
 
 module PDK
   module Validate

data/lib/pdk/version.rb

@@ -1,3 +1,4 @@
 module PDK
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
+  TEMPLATE_REF = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,7 @@ files:
 - lib/pdk/answer_file.rb
 - lib/pdk/cli.rb
 - lib/pdk/cli/bundle.rb
+- lib/pdk/cli/convert.rb
 - lib/pdk/cli/errors.rb
 - lib/pdk/cli/exec.rb
 - lib/pdk/cli/exec_group.rb
@@ -185,34 +200,37 @@ files:
 - lib/pdk/cli/util/option_validator.rb
 - lib/pdk/cli/validate.rb
 - lib/pdk/generate.rb
-- lib/pdk/generators/defined_type.rb
-- lib/pdk/generators/module.rb
-- lib/pdk/generators/puppet_class.rb
-- lib/pdk/generators/puppet_object.rb
-- lib/pdk/generators/task.rb
+- lib/pdk/generate/defined_type.rb
+- lib/pdk/generate/module.rb
+- lib/pdk/generate/puppet_class.rb
+- lib/pdk/generate/puppet_object.rb
+- lib/pdk/generate/task.rb
 - lib/pdk/i18n.rb
 - lib/pdk/logger.rb
+- lib/pdk/module/convert.rb
 - lib/pdk/module/metadata.rb
 - lib/pdk/module/templatedir.rb
+- lib/pdk/module/update_manager.rb
 - lib/pdk/report.rb
 - lib/pdk/report/event.rb
 - lib/pdk/template_file.rb
 - lib/pdk/tests/unit.rb
 - lib/pdk/util.rb
 - lib/pdk/util/bundler.rb
+- lib/pdk/util/git.rb
 - lib/pdk/util/version.rb
 - lib/pdk/util/windows.rb
 - lib/pdk/validate.rb
-- lib/pdk/validators/base_validator.rb
-- lib/pdk/validators/metadata/metadata_json_lint.rb
-- lib/pdk/validators/metadata/metadata_syntax.rb
-- lib/pdk/validators/metadata/task_metadata_lint.rb
-- lib/pdk/validators/metadata_validator.rb
-- lib/pdk/validators/puppet/puppet_lint.rb
-- lib/pdk/validators/puppet/puppet_syntax.rb
-- lib/pdk/validators/puppet_validator.rb
-- lib/pdk/validators/ruby/rubocop.rb
-- lib/pdk/validators/ruby_validator.rb
+- lib/pdk/validate/base_validator.rb
+- lib/pdk/validate/metadata/metadata_json_lint.rb
+- lib/pdk/validate/metadata/metadata_syntax.rb
+- lib/pdk/validate/metadata/task_metadata_lint.rb
+- lib/pdk/validate/metadata_validator.rb
+- lib/pdk/validate/puppet/puppet_lint.rb
+- lib/pdk/validate/puppet/puppet_syntax.rb
+- lib/pdk/validate/puppet_validator.rb
+- lib/pdk/validate/ruby/rubocop.rb
+- lib/pdk/validate/ruby_validator.rb
 - lib/pdk/version.rb
 - lib/puppet/util/windows.rb
 - lib/puppet/util/windows/api_types.rb
@@ -239,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules