simp-metadata 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bec880fc1d3eb1dbeeeca61855155cf4000d9b5a381cb2cb76c77d6585fb3bd
-  data.tar.gz: 4e5536c319838d8fc3eeef7a7be23a46c0d55568d8f5b24e4831214d0a148ee5
+  metadata.gz: 1c26b66ce33c640c85459dca30dbf959aac04cfaef12e643b9af387f014ea96d
+  data.tar.gz: fb8e5ebfd80322c61ac0743338bb45a0dcaffdbb36c647e7b147be485b116239
 SHA512:
-  metadata.gz: 938e43f4ad4718f87ae86b123eb0406cced1a6432c51baf1accbf2996a4594f2261f813109dfa88fbf770a1947aa153dbbe7c49b7c8060817db360d2fcc4f923
-  data.tar.gz: 8489605639a7e0e828c44b31bf591777b7051cf1772a322f402a586426df62c3b7d536b0e3df821f189c2a337f6aacc74acc00a7b9f58ffc199987bea8704f76
+  metadata.gz: ea96c778fac89114e4a5f4efefe15f40324f4433e53a1c01b0448a7f59cdc86a93f70a430e1a49018e038cb6cbae647dd5c25b4a41e44a7f269b12cd9c702b3d
+  data.tar.gz: 84b346be679cc9a48babbe3dd2546d3a48050acb17e1b005e339f8815d34f3df05eb3f45f84741d7f1490876164dac75caff12b76f15429108571996b6d4e690

data/Rakefile

@@ -64,3 +64,50 @@ begin
   end
 rescue LoadError
 end
+task :update_version, [:version] do |task, args|
+  require 'erb'
+  gem_version = args[:version]
+  renderer = ERB.new(File.read('lib/simp/metadata/version.erb'))
+  res = renderer.result(binding)
+  File.open("lib/simp/metadata/version.rb", "w+") do |f|
+    f.write(res)
+  end
+end
+
+task :prerelease, [:version] do |task, args|
+  Rake::Task["update_version"].invoke(args[:version])
+end
+
+namespace :release do
+  desc "Build a Release"
+	task :build, [:version] do |task, args|
+    branch=`git rev-parse --abbrev-ref HEAD`.chomp
+    version = args[:version]
+    if (branch != "develop")
+      puts "CRITICAL: releases must be made off of develop"
+    else
+      puts `git fetch origin`
+      messagelog = []
+      messagelog << "Release #{version}"
+      messagelog << ""
+      `git log --pretty="%s" origin/master...develop`.gsub("'", "\"").chomp.split("\n").each { |l| messagelog << l }
+      releasemessage = messagelog.join("\n")
+      puts `git pull origin`
+      puts `git checkout master`
+      puts `git pull origin`
+      puts `git merge -m '#{releasemessage}' --no-ff develop`
+      Rake::Task["prerelease"].invoke(version)
+      puts `git add -A`
+      puts `git commit --amend -m '#{releasemessage}'`
+      puts `git tag -s -m 'Release #{version}' #{version}`
+      puts `git checkout develop`
+      puts `git merge master`
+    end
+	end
+  task :push do
+    puts `git push origin --tags`
+    puts `git push origin develop:develop`
+    puts `git push origin master:master`
+  end
+end
+

data/lib/simp/metadata.rb

@@ -76,7 +76,11 @@ module Simp
         else
           urlspec = component.primary
         end
-        fetch_from_url(urlspec, retval['path'], component, options)
+        if component.method == 'file'
+          FileUtils.cp_r component.url, directory_name
+        else
+          fetch_from_url(urlspec, retval['path'], component, options)
+        end
       else
         raise "component.class=#{component.class}, #{component.class} is not in ['String', 'Simp::Metadata::Component']"
       end

data/lib/simp/metadata/commands/base.rb

@@ -57,7 +57,7 @@ module Simp
             opts.on('-p', '--platform [platform]', 'el_version to use', 'valid platforms:', ' - el6', ' - el7') do |opt|
               options['platform'] = opt
             end
-            yield(opts) if block_given?
+            yield(opts,options) if block_given?
           end
           option_parser.parse!(argv)
           options

data/lib/simp/metadata/commands/clone.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Clone < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata clone <source_release> <target_release>'
           end
 

data/lib/simp/metadata/commands/component.rb

@@ -8,18 +8,18 @@ module Simp
 
           case subcommand
           when '--help', '-h'
-            options = defaults(argv) do |opts|
+            options = defaults(argv) do |opts,options|
               opts.banner = 'Usage: simp-metadata component [ view | diff | download | build | update | create ]'
             end
 
           when 'create'
-            options = defaults(argv) do |opts|
+            options = defaults(argv) do |opts,options|
               opts.banner = 'Usage: simp-metadata component create <component_name> name=<value>'
             end
             engine, root = get_engine(engine, options)
             component = argv[1]
             argv.shift
-            data = { 'locations' => [{ 'primary' => true }] }
+            data = {'locations' => [{'primary' => true}]}
             argv.each do |argument|
               splitted = argument.split('=')
               name = splitted[0]
@@ -40,7 +40,7 @@ module Simp
             engine.components.create(component, data)
 
           when 'update'
-            options = defaults(argv) do |opts|
+            options = defaults(argv) do |opts,options|
               opts.banner = 'Usage: simp-metadata component update <component> <setting> <value>'
             end
             engine, root = get_engine(engine, options)
@@ -59,8 +59,32 @@ module Simp
               exit 6
             end
 
+          when 'find_release'
+            options = defaults(argv) do |opts, options|
+              opts.banner = "Usage: simp-metadata component find_release <component> <attribute> <value>\n"
+              opts.banner << "  Output releases where specified components <attribute> matches <value>"
+              opts.on('-s', '--show-all', 'Shows all release matches, including unstable and nightlies') do |show_all|
+                options['show_all'] = show_all
+              end
+            end
+            engine, root = get_engine(engine, options)
+            component = argv[1]
+            attribute = argv[2]
+            value = argv[3]
+
+            releases = engine.releases.keys - ['test-stub','test-diff','test-nightly-2018-02-08','5.1.0-2','5.1.0-1','5.1.0-0','4.2.0-0','5.1.0-RC1','5.1.0-Beta','4.2.0-RC1','4.2.0-Beta2']
+            matches = releases.select{ |release| puts "true" if engine.releases[release].components[component].version?; engine.releases[release].components[component][attribute] == value}
+            if options['show_all']
+              output = matches
+            else
+              delete = ['unstable']
+              matches.each{ |match| delete.push(match) if match =~ /nightly-/ }
+              output = matches - delete
+            end
+            puts output
+
           when 'view'
-            options = defaults(argv) do |opts|
+            options = defaults(argv) do |opts,options|
               opts.banner = 'Usage: simp-metadata component view <component> [attribute]'
             end
             engine, root = get_engine(engine, options)
@@ -80,7 +104,7 @@ module Simp
             end
 
           when 'diff'
-            options = defaults(argv) do |opts|
+            options = defaults(argv) do |opts,options|
               opts.banner = 'Usage: simp-metadata component diff <release1> <release2> <component> [attribute]'
             end
             engine, root = get_engine(engine, options)
@@ -94,13 +118,20 @@ module Simp
             puts diff.to_yaml
 
           when 'download'
-            options = defaults(argv) do |opts|
-              opts.banner = 'Usage: simp-metadata component download -v <version> <component> [destination] [source]'
+            options = defaults(argv) do |opts,options|
+              opts.banner = 'Usage: simp-metadata component download [-v <version>] [-d <destination>] [-s <source>] <component>'
+              options['source'] = []
+              opts.on('-s', '--source [path/url]', 'URL or path to grab RPMs from (can be passed more than once)') do |opt|
+                options['source'] << opt
+              end
+              opts.on('-d', '--destination [path]', 'folder to build RPMs in') do |opt|
+                options['destination'] = opt
+              end
             end
             engine, root = get_engine(engine, options)
             component = argv[1]
-            destination = argv[2]
-            source = argv[3]
+            destination = options['destination']
+            source = options['source']
             if engine.components.key?(component)
               if options['release'].nil?
                 comp = engine.components[component]
@@ -114,12 +145,15 @@ module Simp
             end
 
           when 'build'
-            options = defaults(argv) do |opts|
-              opts.banner = 'Usage: simp-metadata component build <component> [destination]'
+            options = defaults(argv) do |opts,options|
+              opts.banner = 'Usage: simp-metadata component build [-v <version>] [-d <destination>] [-s <source>] <component>'
+              opts.on('-d', '--destination [path]', 'folder to build RPMs in') do |opt|
+                options['destination'] = opt
+              end
             end
             engine, root = get_engine(engine, options)
             component = argv[1]
-            destination = argv[2]
+            destination = options['destination']
             if engine.components.key?(component)
               if options['release'].nil?
                 comp = engine.components[component]

data/lib/simp/metadata/commands/delete.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Delete < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata delete <component_name>'
           end
 

data/lib/simp/metadata/commands/pry.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Pry < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata pry'
           end
 

data/lib/simp/metadata/commands/release.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Release < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata release <release_name> [components]'
             opts.banner = '       simp-metadata release diff <release1> <release2>'
           end

data/lib/simp/metadata/commands/releases.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Releases < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata releases'
           end
 

data/lib/simp/metadata/commands/save.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Save < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata save [options] [message]'
           end
 

data/lib/simp/metadata/commands/script.rb

@@ -6,7 +6,7 @@ module Simp
     module Commands
       class Script < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata script [options] <filename>'
           end
 

data/lib/simp/metadata/commands/search.rb

@@ -6,7 +6,7 @@ module Simp
     module Commands
       class Search < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = "Usage: simp-metadata search <attribute>=<value>\n(supports multiple attributes as well as encoded URLs)"
           end
 

data/lib/simp/metadata/commands/set-write-url.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Set_write_url < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata set-write-url <repo_name> <url>'
           end
 

data/lib/simp/metadata/commands/set-write.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Set_write < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata set-write [options]'
           end
 

data/lib/simp/metadata/commands/update.rb

@@ -4,7 +4,7 @@ module Simp
     module Commands
       class Update < Simp::Metadata::Commands::Base
         def run(argv, engine = nil)
-          options = defaults(argv) do |opts|
+          options = defaults(argv) do |opts,options|
             opts.banner = 'Usage: simp-metadata update <component> <setting> <value>'
           end
 

data/lib/simp/metadata/component.rb

@@ -303,6 +303,22 @@ module Simp
         ver
       end
 
+      def version?
+        Dir.mktmpdir do |dir|
+          Dir.chdir(dir) do
+            system("git clone #{url} > /dev/null 2>&1")
+            Dir.chdir("./#{module_name}") do
+              exitcode = Simp::Metadata.run("git checkout #{version} > /dev/null 2>&1")
+              if exitcode == 0
+                true
+              else
+                false
+              end
+            end
+          end
+        end
+      end
+
       def rpm_basename
         if component_type == 'puppet-module'
           if name =~ /pupmod-*/
@@ -522,10 +538,10 @@ module Simp
         rpm_name = self.rpm_name
         return if File.exist?("#{destination}/#{rpm_name}")
         el_version = platform.split('el')[1]
-        if src.nil?
-          sources = ["https://download.simp-project.com/SIMP/yum/simp6/el/#{el_version}/x86_64", "https://download.simp-project.com/SIMP/yum/unstable/el/#{el_version}/x86_64"]
+        if src.any?
+          sources = src
         else
-          sources = [source.to_s]
+          sources = ["https://download.simp-project.com/SIMP/yum/simp6/el/#{el_version}/x86_64", "https://download.simp-project.com/SIMP/yum/unstable/el/#{el_version}/x86_64"]
         end
         sources.each do |source|
           if source =~ /^https?:/
@@ -537,7 +553,7 @@ module Simp
           puts "Copied #{rpm_name} from #{source}" if File.exist?("#{destination}/#{rpm_name}")
           return if File.exist?("#{destination}/#{rpm_name}")
         end
-        puts "Unable to fine #{rpm_name} from #{sources}"
+        puts "Unable to find #{rpm_name} from #{sources}"
       end
     end
   end

data/lib/simp/metadata/engine.rb

@@ -20,12 +20,19 @@ module Simp
         bootstrap_source = Simp::Metadata::Bootstrap_source.new(edition)
         if metadatarepos.class.to_s == 'Hash'
           metadatarepos.each do |reponame, url|
+            if url.match?(/https?:/)
+              method = 'git'
+              extract = false
+            else
+              method = 'file'
+              extract = true
+            end
             # XXX: ToDo replace with better logic once Simp::Metadata.download_component gets refactored.
             # MUCH LAYERING VIOLATIONS
             next unless bootstrap_source.components.key?(reponame)
             bootstrap_source.components[reponame]['locations'][0]['url'] = url
-            bootstrap_source.components[reponame]['locations'][0]['method'] = 'git'
-            bootstrap_source.components[reponame]['locations'][0]['extract'] = false
+            bootstrap_source.components[reponame]['locations'][0]['method'] = method
+            bootstrap_source.components[reponame]['locations'][0]['extract'] = extract
           end
         end
         @sources[bootstrap_source.name] = bootstrap_source

data/lib/simp/metadata/version.erb

@@ -0,0 +1,10 @@
+module Simp
+  module Metadata
+    class Version
+      def self.version
+      '<%= gem_version %>'.freeze
+      end
+    end
+  end
+end
+

data/lib/simp/metadata/version.rb

@@ -2,8 +2,9 @@ module Simp
   module Metadata
     class Version
       def self.version
-      '0.5.2'.freeze
+      '0.5.3'.freeze
       end
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-metadata
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Brandon Riden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -219,6 +219,7 @@ files:
 - lib/simp/metadata/release.rb
 - lib/simp/metadata/releases.rb
 - lib/simp/metadata/source.rb
+- lib/simp/metadata/version.erb
 - lib/simp/metadata/version.rb
 - spec/simp/media/command_spec.rb
 - spec/simp/media/engine_spec.rb
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: SIMP Metadata Library