simp-rake-helpers 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f3004fea3e9d6cba41aa58d83edf6371cc7377d
-  data.tar.gz: 5882f564f3da59c79ea92a7a290cac2cb44377d9
+  metadata.gz: 7f87a58cc38f4d236c1c66e94f9145377b430546
+  data.tar.gz: 1f2c7a736e3974a0ce72a65d778b8cd28c75f318
 SHA512:
-  metadata.gz: 4be260de21206c756ded9772383a9b51408730b7d5af43cfc2372ed052a9f88099aae14e4bf209a599563ed66ff64cc5171fdb97c080a26d50f93d82cee5defb
-  data.tar.gz: 8860976873dae06cc31adb53e2c2ab7c14e8267cdd73bc4ceba753a4b46c1d7c63dee831776d586e6e1844b55bfd22171ce499811b6e555f273125b4ffeb9e49
+  metadata.gz: 2649f7dc066a02e254e531bd3901b568f0e846892418276a30a5ccd190c3cadbcdb468372038aaf4df245512f6b4b2f4d5931729cb1505b0083db63eed49fea2
+  data.tar.gz: eea647a6d2f28d9ace0458b12119888a179cacb248807842486339cd04bd83bd9ddef879a5ffd3bfefec9187d371fd6b8d3ea2694902b0fd941e8465cd05ba90

data/.travis.yml

@@ -1,17 +1,32 @@
----
 language: ruby
 sudo: required
 before_install:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y rpm
-    - rm Gemfile.lock || true
-bundler_args: --without development
+  - sudo apt-get update -qq
+  - sudo apt-get install -y rpm
+  - rm Gemfile.lock || true
+bundler_args: "--without development --path .vendor"
 notifications:
   email: false
 rvm:
   - 2.1.9
   - 2.3.3
 script:
-  - "bundle exec rake spec"
+  - 'bundle exec rake spec'
 matrix:
   fast_finish: true
+  allow_failures:
+    - rvm: 2.3.3
+before_deploy:
+  - 'bundle exec rake clobber'
+  - "export GEM_VERSION=`ruby -r ./lib/simp/rake/helpers/version.rb -e 'puts Simp::Rake::Helpers::VERSION'`"
+  - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
+deploy:
+  provider: rubygems
+  gemspec: simp-rake-helpers.gemspec
+  gem: simp-rake-helpers
+  on:
+    tags: true
+    rvm: 2.1.9
+    condition: '($SKIP_PUBLISH != true)'
+  api_key:
+    secure: aoPmOZ3WgjNJ56UXmamKxaRv37iUaxKekAeS8n2fPk78X/nU2qGjdDHFH+SBrfl33PyzsGnS3WAANMKaIkAgssvKoaII/sAC+Sl6q1eyVUprZqloXrG+cHlnHY4GnziWEH3JrkHDChW0xoJq7hhpj7qTRKrEIp6nA25MjozjveoL+HH4kKy/ACJhiEdsYTFaDLYYFY50gGUL9KjIkwN6g9d+dIzG9JqcYoDbneQlO6/23yr4GiAHQ8HM1j5tUoBqJad+CWjWhSY7pbfYBy2ziwVhFy1qoOS4/bhlasRCsLTtz0AjjR0YWOhJap1vJqYhrSxtvhmVuzScmDkueAem/PfWS3XCQvbmjdmFMzPOxo0aRRJMlaeVWRsZ/aVFC7ngpRzokq1duZEKI47xZC27vJSOp3RZMmYl/7GsykoYkqHHsTvzSALEQiVtQq8sIOtN0JOTFI8H4LSMirXuqGq+SgCJiAQ3mQzSgh50TXiZaA2UPPcQaw4AzY36BRKs1cgw3cEWuL38O2cWUTAzEE4SUh499wrU5x+N0PsYL0AvMFONsRaq5epOYrlIL9UPSL/qZRLmzpcEWZRfOX4Ni5N6Aa9ZR8juenR6UmE79S2dupBxQeinkdfXuWznUZH7BcnUDoz8rErABpJGHNVY60dUO/s055WCr7Y95Gi+H75X9/I=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.6.0 / 2017-07-03
+* Added changelog_annotation task
+
+### 3.5.2 / 2017-06-16
+* Fixed code count error
+
 ### 3.5.1 / 2017-05-15
 * Fix ability to build with existing tarball
 

data/Gemfile

@@ -2,7 +2,7 @@
 #
 # SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
 # PUPPET_VERSION   | specifies the version of the puppet gem to load
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : false
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~> 4'
 gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
 
 gem_sources.each { |gem_source| source gem_source }

data/lib/simp/rake/build/code.rb

@@ -86,7 +86,7 @@ module Simp::Rake::Build
           loc["spec"] = 0
           loc["other"] = 0
 
-          File.open("#{SRC_DIR}/../Rakefile","r").each do |line|
+          File.open("#{@base_dir}/Rakefile","r").each do |line|
             if encode_line(line) !~ /^\s*$/
               loc["rake"] = loc["rake"] + 1
             end
@@ -94,7 +94,7 @@ module Simp::Rake::Build
 
           other_ext = Array.new
 
-          Find.find(SRC_DIR) do |path|
+          Find.find(@src_dir) do |path|
             if (
               ( File.basename(path)[0] == ?. ) or
               ( path =~ /src\/rsync/ ) or

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -0,0 +1 @@
+lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '3.5.1'
+  VERSION = '3.6.0'
 end

data/lib/simp/rake/pupmod/helpers.rb

@@ -80,6 +80,72 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
       sh "metadata-json-lint metadata.json"
     end
 
+    desc <<-EOM
+      Generate an appropriate annotated tag entry from a CHANGELOG.
+
+      ARGS:
+        * :quiet => Set to 'true' if you want to suppress warning messages
+
+      NOTES:
+        * The entries are extracted from a match with the version from the
+          module's metadata.json
+        * If no match is found, the task will fail
+        * Changelog entries must follow the format:
+          * Wed Jul 05 2017 UserName <username@simp.com> - 1.2.3-4
+            - The entry must start with *. Any line beginning with * will be
+              interpreted as an entry.
+            - The dates must be RPM compatible, in chronological order
+            - The user email must be contained in < >
+            - The entry must be terminated by the release
+        * Any entry that does not follow the prescribed format will not be
+          annotated properly
+    EOM
+    # TODO: Hook in a query of the auto-generated specfile:
+    #   `rpm -q --specfile dist/tmp/*.spec --changelog`
+    # That will give Travis a way of warning us if the changelog
+    # will prevent the rpm from building.
+    task :changelog_annotation, [:quiet] do |t,args|
+      require 'json'
+
+      quiet = true if args[:quiet].to_s == 'true'
+
+      module_version = JSON.parse(File.read('metadata.json'))['version']
+
+      changelog = Hash.new
+      delim = nil
+      ignore_line = false
+
+      File.read('CHANGELOG').each_line do |line|
+        if line =~ /^\*/
+          if /^\*\s+((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{4})\s+(.+<.+>)(?:\s+|\s*-\s*)?(\d+\.\d+\.\d+)/.match(line).nil?
+             warn "WARNING: invalid changelog entry: #{line}" unless quiet
+             # Don't add anything to the annotation until we reach the next
+             # valid entry
+             ignore_line = true
+          else
+            ignore_line = false
+            delim           = Hash.new
+            delim[:date]    = $1
+            delim[:user]    = $2
+            delim[:release] = $3
+
+            changelog[delim[:release]] ||= Array.new
+            changelog[delim[:release]] << line
+          end
+
+          next
+        end
+
+        if delim && delim[:release]
+          changelog[delim[:release]] << '  ' + line unless ignore_line
+        end
+      end
+
+      fail "Did not find any changelog entries for version #{module_version}" if changelog[module_version].nil?
+      puts "\nRelease of #{module_version}\n\n"
+      puts changelog[module_version]
+    end
+
 
     desc "Run syntax, lint, and spec tests."
     task :test => [

data/spec/lib/simp/files/build/testpackage.spec

@@ -0,0 +1 @@
+spec/lib/simp/files/build/../testpackage.spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -1,356 +0,0 @@
-%{lua:
-
---
--- When you build you must to pass this along so that we know how
--- to get the preliminary information.
--- This directory should hold the following items:
---   * 'build/rpm_metadata/requires' <- optional list of 'Requires', 'Provides',
---      and 'Obsoletes' to supplement those auto-generated in this spec file
---   * 'build/rpm_metadata/release' <- optional RPM release number to use in
---      lieu of number hard-coded in this spec file
---   * 'CHANGELOG' <- optional RPM formatted Changelog to use in lieu of minimal,
---      changelog entry auto-generated in this spec file
---   * 'metadata.json' <- required file that must contain the following metadata:
---     - 'name' - package name
---     - 'version' - package version
---     - 'license' - package license
---     - 'summary' - package summary
---     - 'source' - package source
---
--- Example:
---   rpmbuild -D 'pup_module_info_dir /home/user/project/puppet_module' -ba SPECS/specfile.spec
---
--- If this is not found, we will look in %{_sourcedir} for the files and fall
--- back to the current directory
---
-
-src_dir = rpm.expand('%{pup_module_info_dir}')
-
-if string.match(src_dir, '^%%') or (posix.stat(src_dir, 'type') ~= 'directory') then
-  src_dir = rpm.expand('%{_sourcedir}')
-
-  if (posix.stat((src_dir .. "/metadata.json"), 'type') ~= 'regular') then
-    src_dir = './'
-  end
-end
-
--- These UNKNOWN entries should break the build if something bad happens
-
-package_name = "UNKNOWN"
-package_version = "UNKNOWN"
-module_license = "UNKNOWN"
-
---
--- Default to 2016
--- This was done due to the change in naming scheme across all of the modules.
--- The '.1' bump is there for the SIMP 6 path changes
---
-
-package_release = '2016.1'
-
-}
-
-%{lua:
--- Pull the Relevant Metadata out of the Puppet module metadata.json.
-
-metadata = ''
-metadata_file = io.open(src_dir .. "/metadata.json","r")
-if metadata_file then
-  metadata = metadata_file:read("*all")
-
-  -- Ignore the first curly brace
-  metadata = metadata:gsub("{}?", '|', 1)
-
-  -- Ignore all keys that are below the first level
-  metadata = metadata:gsub("{.-}", '')
-  metadata = metadata:gsub("%[.-%]", '')
-else
-  error("Could not open 'metadata.json'", 0)
-end
-
--- This starts as an empty string so that we can build it later
-module_requires = ''
-
-}
-
-%{lua:
-
--- Get the Module Name and put it in the correct format
-
-local name_match = string.match(metadata, '"name":%s+"(.-)"%s*,')
-
-module_author = ''
-module_name = ''
-
-if name_match then
-  package_name = ('pupmod-' .. name_match)
-
-  local i = 0
-  for str in string.gmatch(name_match,'[^-]+') do
-    if i == 0 then
-      module_author = str
-    else
-      if module_name == '' then
-        module_name = str
-      else
-        module_name = (module_name .. '-' .. str)
-      end
-    end
-
-    i = i+1
-  end
-else
-  error("Could not find valid package name in 'metadata.json'", 0)
-end
-
-}
-
-%{lua:
-
--- Get the Module Version
-
-local version_match = string.match(metadata, '"version":%s+"(.-)"%s*,')
-
-if version_match then
-  package_version = version_match
-else
-  error("Could not find valid package version in 'metadata.json'", 0)
-end
-
-}
-
-%{lua:
-
--- Get the Module License
-
-local license_match = string.match(metadata, '"license":%s+"(.-)"%s*,')
-
-if license_match then
-  module_license = license_match
-else
-  error("Could not find valid package license in 'metadata.json'", 0)
-end
-
-}
-
-%{lua:
-
--- Get the Module Summary
-
-local summary_match = string.match(metadata, '"summary":%s+"(.-)"%s*,')
-
-if summary_match then
-  module_summary = summary_match
-else
-  error("Could not find valid package summary in 'metadata.json'", 0)
-end
-
-}
-
-%{lua:
-
--- Get the Module Source line for the URL string
-
-local source_match = string.match(metadata, '"source":%s+"(.-)"%s*,')
-
-if source_match then
-  module_source = source_match
-else
-  error("Could not find valid package source in 'metadata.json'", 0)
-end
-
-}
-
-%{lua:
-
--- Snag the RPM-specific items out of the 'build/rpm_metadata' directory
-
--- First, the Release Number
-
-rel_file = io.open(src_dir .. "/build/rpm_metadata/release", "r")
-
-if not rel_file then
-  -- Need this for the SRPM case
-  rel_file = io.open(src_dir .. "/release", "r")
-end
-
-if rel_file then
-  for line in rel_file:lines() do
-    is_comment = string.match(line, "^%s*#")
-    is_blank = string.match(line, "^%s*$")
-
-    if not (is_comment or is_blank) then
-      package_release = line
-      break
-    end
-  end
-end
-
-}
-
-%{lua:
-
--- Next, the Requirements
-req_file = io.open(src_dir .. "/build/rpm_metadata/requires", "r")
-
-if not req_file then
-  -- Need this for the SRPM case
-  req_file = io.open(src_dir .. "/requires", "r")
-end
-
-if req_file then
-  for line in req_file:lines() do
-    valid_line = (string.match(line, "^Requires: ") or string.match(line, "^Obsoletes: ") or string.match(line, "^Provides: "))
-
-    if valid_line then
-      module_requires = (module_requires .. "\n" .. line)
-    end
-  end
-end
-}
-
-%define module_name %{lua: print(module_name)}
-%define package_name %{lua: print(package_name)}
-
-Summary:   %{module_name} Puppet Module
-Name:      %{package_name}
-
-Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
-License:   %{lua: print(module_license)}
-Group:     Applications/System
-Source0:   %{package_name}-%{version}-%{release}.tar.gz
-Source1:   %{lua: print("metadata.json")}
-%{lua:
-  -- Include our sources as appropriate
-  changelog = io.open(src_dir .. "/CHANGELOG","r")
-  if changelog then
-    print("Source2: " .. "CHANGELOG\n")
-  end
-
-  if rel_file then
-    print("Source3: " .. "release\n")
-  end
-  if req_file then
-    print("Source4: " .. "requires\n")
-  end
-}
-URL:       %{lua: print(module_source)}
-BuildRoot: %{_tmppath}/%{package_name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-
-Requires(pre,preun,post,postun): simp-adapter >= 0.0.1
-
-%if ("%{package_name}" != "pupmod-simp-simplib") && ("%{package_name}" != "pupmod-puppetlabs-stdlib")
-Requires: pupmod-simp-simplib >= 1.2.6
-%endif
-
-%if "%{package_name}" != "pupmod-puppetlabs-stdlib"
-Requires: pupmod-puppetlabs-stdlib >= 4.9.0
-Requires: pupmod-puppetlabs-stdlib < 6.0.0
-%endif
-
-%{lua: print(module_requires)}
-
-Provides: pupmod-%{lua: print(module_name)} = %{lua: print(package_version .. "-" .. package_release)}
-Obsoletes: pupmod-%{lua: print(module_name)} < %{lua: print(package_version .. "-" .. package_release)}
-
-%{lua:
-
-  -- This is a workaround for the 'simp-rsync' real RPM conflict but is
-  -- required by some external modules.
-  -- This should be removed when SIMP 6 is stable
-
-  author_rpm_name = module_author .. "-" .. module_name
-
-  if author_rpm_name ~= 'simp-rsync' then
-    print("Provides: " .. author_rpm_name .. " = " .. package_version .. "-" .. package_release .. "\n")
-    print("Obsoletes: " .. author_rpm_name .. " < " .. package_version .. "-" .. package_release ..  "\n")
-  end
-}
-
-Prefix: /usr/share/simp/modules
-
-%description
-%{lua: print(module_summary)}
-
-%prep
-%setup -q -n %{package_name}-%{version}
-
-%build
-
-%install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{prefix}
-
-curdir=`pwd`
-dirname=`basename $curdir`
-cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
-rm -rf %{buildroot}/%{prefix}/%{module_name}/.git
-rm -f %{buildroot}/%{prefix}/*.lock
-rm -rf %{buildroot}/%{prefix}/spec/fixtures/modules
-rm -rf %{buildroot}/%{prefix}/dist
-rm -rf %{buildroot}/%{prefix}/junit
-rm -rf %{buildroot}/%{prefix}/log
-
-%clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{prefix}
-
-%files
-%defattr(0640,root,root,0750)
-%{prefix}/%{module_name}
-
-# when $1 = 1, this is an install
-# when $1 = 2, this is an upgrade
-%pre
-/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='pre' --rpm_status=$1
-
-# when $1 = 1, this is an install
-# when $1 = 2, this is an upgrade
-%post
-/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='post' --rpm_status=$1
-
-# when $1 = 1, this is the uninstall of the previous version during an upgrade
-# when $1 = 0, this is the uninstall of the only version during an erase
-%preun
-/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='preun' --rpm_status=$1
-
-# when $1 = 1, this is the uninstall of the previous version during an upgrade
-# when $1 = 0, this is the uninstall of the only version during an erase
-%postun
-/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='postun' --rpm_status=$1
-
-%changelog
-%{lua:
--- Finally, the CHANGELOG
-
--- A default CHANGELOG in case we cannot find a real one
-
-default_changelog = [===[
-* $date Auto Changelog <auto@no.body> - $version-$release
-- Latest release of $name
-]===]
-
-default_lookup_table = {
-  date = os.date("%a %b %d %Y"),
-  version = package_version,
-  release = package_release,
-  name = package_name
-}
-
-changelog = io.open(src_dir .. "/CHANGELOG","r")
-if changelog then
-  first_line = changelog:read()
-  if string.match(first_line, "^*%s+%a%a%a%s+%a%a%a%s+%d%d?%s+%d%d%d%d%s+.+") then
-    changelog:seek("set",0)
-    print(changelog:read("*all"))
-  else
-    print((default_changelog:gsub('$(%w+)', default_lookup_table)))
-  end
-else
-  print((default_changelog:gsub('$(%w+)', default_lookup_table)))
-end
-}

data/spec/lib/simp/files/build/testpackage.spec

@@ -1,32 +0,0 @@
-Name:           testpackage
-Version:        1
-Release:        0
-Summary:        dummy test package
-BuildArch:      noarch
-
-License:        Apache-2.0
-URL:            http://foo.bar
-
-%description
-A dummy package used to test Simp::RPM methods
-
-%prep
-exit 0
-
-%build
-exit 0
-
-
-%install
-exit 0
-
-%clean
-exit 0
-
-%files
-%doc
-
-
-%changelog
-* Wed Jun 10 2015 nobody
-- some comment