arfor 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e69a377781896f58d64cf952d3d3adb5354ba9
-  data.tar.gz: 5ad856f55141de3e2aac963903fcb5910e9bf491
+  metadata.gz: 1525985237362f2ec30862ff0195a173e5fee94c
+  data.tar.gz: a4f89b20bf4f61ca08d7ee52cc270e20c6a122c3
 SHA512:
-  metadata.gz: 768207f612154e3a9e06171f7ee78fe92e0c599596b5ef3754a4d06debc0d2bd05b60f42b0ed5e3692963178b29db867d3c1010649b58921fef6105bb6c4fe68
-  data.tar.gz: 300175aa21e004da8fa7f38dd3719cf844ee7e8367be9762fe99e3ae2d19cddaee0ce50c3651489425febc2a615ccb8050059e8de9e209f267626b9f4da63e39
+  metadata.gz: 329a98aecc4ab5db21c99b6d4e9249002827be8f69f6708b26b98b3191888a3a9d3b36dd2a3642e695712b00fd0864f25409a22b69bfbb73931ecf2934b66cba
+  data.tar.gz: 9cf4cd422594bf4744f76343d19bb3f15d18a4bd6d68160707263e0d0775158b58fdbc1567e9e180aebfe0ebaac198f6e3e617d0c1a05c335feb4ec621950ac1

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea

data/README.md

@@ -22,6 +22,18 @@ Or install it yourself as:
 
 ## Usage
 
+### Making puppet forge modules
+```
+arfor github_module
+```
+
+#### Features
+* Metadata and github descriptions written
+* PDQTest installed
+* README.md re-written with link to reference docs
+* Enable travis-ci testing
+
+
 ### Making control repositories
 ```
 arfor control_repo

data/arfor.gemspec

@@ -6,12 +6,12 @@ require 'arfor/version'
 Gem::Specification.new do |spec|
   spec.name          = "arfor"
   spec.version       = Arfor::VERSION
-  spec.authors       = ["Geoff Williams"]
-  spec.email         = ["geoff.williams@puppet.com"]
+  spec.authors       = ["Declarative Systems"]
+  spec.email         = ["sales@declarativesystems.com"]
 
   spec.summary       = %q{a cool tool to download bits n pieces for puppet}
   spec.description   = %q{make puppet installers quicker and more reliable}
-  spec.homepage      = "https://github.com/GeoffWilliams/arfor/"
+  spec.homepage      = "https://github.com/declarativesystems/arfor/"
   spec.license       = "Apache-2.0"
 
 
@@ -22,18 +22,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "fakefs", "0.10.2"
   spec.add_development_dependency "sinatra", "1.4.8"
 
   spec.add_runtime_dependency "escort", "0.4.0"
-  spec.add_runtime_dependency "pe_info", "0.1.4"
-  spec.add_runtime_dependency 'ruby-progressbar', '1.8.1'
+  spec.add_runtime_dependency "pe_info", "0.2.1"
+  spec.add_runtime_dependency 'ruby-progressbar', '1.9.0'
   spec.add_runtime_dependency "octokit", "~> 4.0"
   spec.add_runtime_dependency "highline", "1.7.8"
   spec.add_runtime_dependency "puppet"
-  spec.add_runtime_dependency "pdqtest", "0.4.3"
+  spec.add_runtime_dependency "pdqtest", "0.10.0"
   spec.add_runtime_dependency "travis"
 end

data/exe/arfor

@@ -15,6 +15,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+# Inline bundler makes us always use bundler to bundle our bundles because
+# there is a conflict for faraday version between puppet_forge and one of
+# the other gems in use.  Bundler will automatically resolve this as long
+# as its used at _any_ level.  This is equivalent to making a tempdir with
+# a Gemfile and running from there, eg this restores functionality with the
+# native ruby running outside of bundler (by forcing bundler to load)
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'arfor'
+end
+
+
 require 'escort'
 require 'arfor'
 require 'arfor/agent_installers'
@@ -36,17 +51,10 @@ Escort::App.create do |app|
     command.summary "Download agents"
     command.description "Download agent installers locally for faster deployments"
     command.options do |opts|
-      opts.opt(:pe_version,
-        'PE version to download agents for (not needed if tarball specified)',
-        :long    => '--pe-version',
-        :type    => :string,
-        :default => '2016.4.2'
-      )
-      opts.opt(:agent_version,
-        'Agent version to download (not needed if tarball specified)',
-        :long     => '--agent-version',
-        :type     => :string,
-        :default  => '1.7.1'
+      opts.opt(:print_urls,
+        'Just print the URLS we would use, dont download anything',
+        :long     => '--print-urls',
+        :type     => :boolean,
       )
       opts.opt(:pe_tarball,
         'Point Arfor at a PE Master tarball to automatically obtain the correct installers',
@@ -55,14 +63,13 @@ Escort::App.create do |app|
       )
     end
     command.action do |options, arguments|
-      cmd           = :agent_installers # FIXME obtain this automatically
-      pe_version    = options[:global][:commands][cmd][:options][:pe_version]
-      agent_version = options[:global][:commands][cmd][:options][:agent_version]
-      pe_tarball    = options[:global][:commands][cmd][:options][:pe_tarball]
+      cmd         = :agent_installers # FIXME obtain this automatically
+      print_urls  = options[:global][:commands][cmd][:options][:print_urls]
+      pe_tarball  = options[:global][:commands][cmd][:options][:pe_tarball]
       if pe_tarball
-        pe_version, agent_version = PeInfo::Tarball::inspect(pe_tarball)
+        pe_version, agent_version, supported_platforms = PeInfo::Tarball::inspect(pe_tarball)
       end
-      Arfor::AgentInstallers::download(pe_version, agent_version)
+      Arfor::AgentInstallers::download(pe_version, agent_version, supported_platforms, print_urls)
     end
 
     app.command :gems do |command|

data/lib/arfor/agent_installers.rb

@@ -18,51 +18,6 @@ require 'fileutils'
 module Arfor
   module AgentInstallers
 
-    # platforms list obtained by running
-    # cd /opt/puppetlabs/puppet/modules/pe_repo/manifests
-    # cat platform/*.pp | grep pe_repo::
-    # on a puppet enterprise master - you will have to clean up the output...
-
-    PLATFORMS = [
-      'aix-5.3-power',
-      'aix-6.1-power',
-      'aix-7.1-power',
-      'debian-7-amd64',
-      'debian-7-i386',
-      'debian-8-amd64',
-      'debian-8-i386',
-      'el-4-i386',
-      'el-4-x86_64',
-      'el-5-i386',
-      'el-5-x86_64',
-      'el-6-i386',
-      'el-6-s390x',
-      'el-6-x86_64',
-      'el-7-s390x',
-      'el-7-x86_64',
-      'fedora-23-i386',
-      'fedora-23-x86_64',
-      'fedora-24-i386',
-      'fedora-24-x86_64',
-      'fedora-25-i386',
-      'fedora-25-x86_64',
-      'sles-11-i386',
-      'sles-11-x86_64',
-      'sles-12-x86_64',
-      'solaris-10-i386',
-      'solaris-10-sparc',
-      'solaris-11-i386',
-      'solaris-11-sparc',
-      'ubuntu-12.04-amd64',
-      'ubuntu-12.04-i386',
-      'ubuntu-14.04-amd64',
-      'ubuntu-14.04-i386',
-      'ubuntu-16.04-amd64',
-      'ubuntu-16.04-i386',
-      'ubuntu-16.10-amd64',
-      'ubuntu-16.10-i386',
-    ]
-
     WINDOWS = [
       'x86',
       'x64',
@@ -80,7 +35,7 @@ module Arfor
       @@base_url
     end
 
-    def self.download(pe_version, agent_version)
+    def self.download(pe_version, agent_version, supported_platforms, print_urls)
 
       base_url_agent    = "#{@@base_url}/#{pe_version}/#{agent_version}/repos"
       base_url_normal   = "#{base_url_agent}/puppet-agent-"
@@ -93,14 +48,22 @@ module Arfor
         FileUtils.mkdir_p(download_dir)
       end
       Dir.chdir(download_dir) do
-        PLATFORMS.each { |platform|
+        supported_platforms.each { |platform|
           url = "#{base_url_normal}#{platform}#{suffix}"
-          Arfor::Download::get(url)
+          if print_urls
+            puts url
+          else
+            Arfor::Download::get(url)
+          end
         }
 
         WINDOWS.each { |platform|
           url = "#{base_url_windows}#{platform}#{suffix_windows}"
-          Arfor::Download::get(url)
+          if print_urls
+            puts url
+          else
+            Arfor::Download::get(url)
+          end
         }
       end
     end

data/lib/arfor/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Arfor
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arfor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
-- Geoff Williams
+- Declarative Systems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: '0'
 description: make puppet installers quicker and more reliable
 email:
-- geoff.williams@puppet.com
+- sales@declarativesystems.com
 executables:
 - arfor
 extensions: []
@@ -225,7 +225,7 @@ files:
 - res/control_repo/Puppetfile.mock
 - res/control_repo/README.md
 - res/puppet_module/README.md.erb
-homepage: https://github.com/GeoffWilliams/arfor/
+homepage: https://github.com/declarativesystems/arfor/
 licenses:
 - Apache-2.0
 metadata: {}
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: a cool tool to download bits n pieces for puppet