puppet-moddeps 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWY4NmZmNmVlOWY5Yjk5NDIwMmUxZGFjMTg3MDhmMTE2ZjgwN2IyOA==
-  data.tar.gz: !binary |-
-    OTQzOTczYWYzNGRhZDNlN2RmZTljMjAwODZmM2ZiNmViNTEzNjlhMA==
+SHA1:
+  metadata.gz: 4d42cad287c556f394c3e9969232c21c44cf6cd5
+  data.tar.gz: b2089338ea99f42c3c32b149340ebf688385124d
 SHA512:
-  metadata.gz: !binary |-
-    ZTQ2ZDE3MmQzYmJkYTYyYjlkNTQ4MWI4ODhlZjU0NjFhYjRjZTU0MmU2OGVh
-    MGM5ZDg5ZDZkMjIyZmQyNjc4MjdlZGU0Mzk3MzdjNWQyNGQ3NzVmOTkxYzhm
-    ZjdjNzQ3NTgxY2VlMDE0NDgxNWY2YmI5ZDU5MmRmNWU2M2VmOTU=
-  data.tar.gz: !binary |-
-    MTYyY2Y0MThiZWQ4MDI4NzhmZDAxZjU5NWVlM2UzOGM3NDYwNGY3MzdlYWVj
-    ZWQxOGQwZjcyNDViODJmNTQ1YTcwNDRlMDBmOGM4MmEyYWU3YzJiZDAzNjYz
-    MjE4NDcxNGU2YjFlMmU2MTA2YzhiZjMxODY0MTVlZWIzNDBlNWY=
+  metadata.gz: c54b55ad7e24bb7e04d2e5c754b92ed15de92530833711ceda4a07412dae7613b24a0dfaef45d2afcb0b5a4bb214fd07b629fc4299db56f8c4d7b8ebcd699a6b
+  data.tar.gz: 7063ae86762bc4d8ddafc31a87a519a4b801e2bf24fc9835565e92c35c608d69888d0d6a58b76158bc68b412463a3fc5ca0a5eeb2d20f3ed6ec7725a21cbbc2d

data/.gitignore

@@ -23,3 +23,4 @@ mkmf.log
 
 /.c9/
 /.idea/
+/projectFilesBackup/

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Change Log for Puppet::Moddeps
+
+[![GitHub tag][tag-img]][tag] [![Gem Version][gem-v-img]][gem-version]
+
+## v1.1.0
+
+* converted to a class-based code structure
+* removed Gemfile.lock for flexibility of using dynamic Puppet versions for
+  testing
+* improved testablilty and fixed it so that all test pass
+
+## v1.2.0
+
+* created this changelog
+* simplified vagrant setup
+* updated documentation
+* fixed bug preventing reporting test results to multiple places
+* adjusted testing code for Windows - builds should work just as on Linux
+
+
+
+[gem-v-img]: https://badge.fury.io/rb/puppet-moddeps.svg
+[gem-version]: http://badge.fury.io/rb/puppet-moddeps
+[tag]: https://github.com/genebean/puppet-moddeps
+[tag-img]: https://img.shields.io/github/tag/genebean/puppet-moddeps.svg

data/LICENSE

@@ -1,28 +1,28 @@
-Copyright (c) 2014, genebean
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of puppet-moddeps nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+Copyright (c) 2014, genebean
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of puppet-moddeps nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

data/README.md

@@ -21,7 +21,7 @@ GitHub that have a populated `metadata.json` file.
 puppet-moddeps has been extensively tested on CentOS 6 using the system ruby
 (v1.8.7). Due to dependency requirements all development is done on ruby 1.9.3
 or higher. Automated testing of v1.8.7 cannot be done on Travis-CI due to the
-development dependancies..
+development dependencies.
 
 ## Installation
 
@@ -66,15 +66,21 @@ the version available in Red Hat / CentOS 6.
 
 Development and testing can also be done utilizing the included `Vagrantfile`.
 To do so, install [Vagrant][vagrant] and [VirtualBox][vbox], fork and clone the
-project, cd into the project, and run `vagrant up dev` followed by `vagrant ssh
-dev`.  The setup process will take care of running `bundle install` for you. You
-can find the code symlinked into the vagrant user's home directory.
+project, cd into the project, and run `vagrant up` followed by `vagrant ssh`.
+The setup process will take care of running `bundle install` for you. You
+can find the code symlinked into the vagrant user's home directory. Also, RVM
+is installed system-wide in the referenced Vagrant box.
 
 ### Tests
 
 Please try and write tests using Rspec's expect syntax for any code you add or change.
 Code must have tests before it will be merged.
 
+## License
+
+This code is released under the New BSD license (aka 3-clause BSD). A copy is
+in the LICENSE file in this repo.
+
 
 [code-climate]: https://codeclimate.com/github/genebean/puppet-moddeps
 [cc-img]: https://img.shields.io/codeclimate/github/genebean/puppet-moddeps.svg

data/Vagrantfile

@@ -5,22 +5,12 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "genebean/centos6-puppet-64bit"
+  config.vm.box = "genebean/centos6-rvm193-64bit"
 
-  config.vm.define "dev", primary: true do |dev|
+  config.vm.synced_folder "./", "/home/vagrant/puppet-moddeps"
 
-    dev.vm.synced_folder "./", "/home/vagrant/puppet-moddeps"
+  config.vm.provision "shell", inline: "yum -y install dos2unix git nano ruby-devel tree vim-enhanced"
+  config.vm.provision "shell", inline: "dos2unix /vagrant/scripts/*.sh"
+  config.vm.provision "shell", inline: "su - vagrant -c 'export PUPPET_VERSION=3.7.3; /vagrant/scripts/vagrant-user.sh'"
 
-    dev.vm.provision "shell", inline: "yum -y install dos2unix git nano ruby-devel tree vim-enhanced"
-    dev.vm.provision "shell", inline: "dos2unix /vagrant/scripts/*.sh"
-    dev.vm.provision "shell", inline: "su - vagrant -c 'export PUPPET_VERSION=3.7.3; /vagrant/scripts/vagrant-user.sh'"
-
-  end
-
-  config.vm.define "test" do |test|
-    test.vm.provision "shell", inline: "yum -y install git ruby-devel tree"
-    test.vm.provision "shell", inline: "gem install puppet-moddeps"
-    test.vm.provision "shell", inline: "git clone https://github.com/puppetlabs/puppetlabs-apache.git /etc/puppet/modules/apache"
-    test.vm.provision "shell", inline: "puppet-moddeps apache"
-  end
 end

data/lib/puppet/moddeps/install_deps.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'json'
+require 'rbconfig'
 
 module Puppet
   module Moddeps
@@ -13,7 +14,8 @@ module Puppet
         elsif path
           abort('The provided path was not a string.')
         else
-          @module_path = %x(puppet config print modulepath).split(':')[0]
+          separator = self.path_separator(RbConfig::CONFIG['host_os'])
+          @module_path = %x(puppet config print modulepath).split(separator)[0]
         end
 
         if deps and deps.is_a?(Array)
@@ -54,6 +56,14 @@ module Puppet
         File.directory?("#{@module_path}/#{module_name}")
       end
 
+      def path_separator(os_string)
+        if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ os_string) != nil
+          separator = ';'
+        else
+          separator = ':'
+        end
+      end
+
       def parse_metadata(module_name)
         metadata = File.read("#{@module_path}/#{module_name}/metadata.json")
         data     = JSON.parse(metadata)

data/lib/puppet/moddeps/version.rb

@@ -1,5 +1,5 @@
 module Puppet
   module Moddeps
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/puppet-moddeps.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'rspec-nc', '~> 0.2'
+  spec.add_development_dependency 'wdm', '>= 0.1.0' if Gem.win_platform?
 
   if ENV.key?('PUPPET_VERSION')
     puppetversion = "= #{ENV['PUPPET_VERSION']}"

data/scripts/vagrant-user.sh

@@ -6,16 +6,7 @@ if [ -f '/vagrant/GitConfig' ]; then
   cp /vagrant/GitConfig ~/.gitconfig
 fi
 
-# Setup RVM
-gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
-curl -L get.rvm.io | bash -s stable
-source ~/.profile
-
-# Setup Ruby 1.9.3
-rvm install 1.9.3
-rvm use 1.9.3
-
 # Setup project
 gem install bundler --no-ri --no-rdoc
 cd puppet-moddeps
-bundle install
+bundle install --jobs=3 --retry=3

data/spec/install_deps_spec.rb

@@ -4,8 +4,18 @@ describe Puppet::Moddeps::InstallDeps do
 
   before(:all) do
     puts 'Downloading the puppetlabs-apache module...'
+
     %x(puppet module install puppetlabs-apache --ignore-dependencies)
-    @expected_path = %x(puppet config print modulepath).split(':')[0]
+
+    @dirs_to_clean = ['apache']
+
+    if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RbConfig::CONFIG['host_os']) != nil
+      @expected_path = %x(puppet config print modulepath).split(';')[0]
+    else
+      @expected_path = %x(puppet config print modulepath).split(':')[0]
+    end
+
+    puts "The expected module path is: #{@expected_path}"
   end
 
   describe '.initialize(path, deps)' do
@@ -70,6 +80,23 @@ describe Puppet::Moddeps::InstallDeps do
 
   end
 
+  describe '.path_separator' do
+
+    subject { Puppet::Moddeps::InstallDeps.new }
+
+    context 'on Windows' do
+      it 'should return ; as the path separator' do
+        expect(subject.path_separator('mingw32')).to eq(';')
+      end
+    end
+
+    context 'on Linux' do
+      it 'should return : as the path separator' do
+        expect(subject.path_separator('linux-gnu')).to eq(':')
+      end
+    end
+  end
+
   describe '.parse_metadata' do
 
     it "should parse metadata.json" do
@@ -112,7 +139,11 @@ describe Puppet::Moddeps::InstallDeps do
        basedir = base_object.module_path
 
        base_object.deps.each do |dep|
-         expect(File.directory?("#{basedir}/#{dep.split('-')[1]}")).to eql(true)
+         mod_dir = dep.split('-')[1]
+         @dirs_to_clean.push(mod_dir)
+
+         mod_path = "#{basedir}/#{mod_dir}"
+         expect(File.directory?(mod_path)).to eql(true)
        end
 
      end
@@ -120,8 +151,19 @@ describe Puppet::Moddeps::InstallDeps do
   end
 
   after(:all) do
-    puts "Removing all modules from #{@expected_path}"
-    %x(rm -rf #{@expected_path}/*)
+
+    @dirs_to_clean.each do |mod_dir|
+      path_to_clean = @expected_path + "/#{mod_dir}"
+
+      if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RbConfig::CONFIG['host_os']) != nil
+        puts "Removing #{path_to_clean.gsub '/', '\\'}"
+        %x(rmdir /Q /S #{path_to_clean.gsub '/', '\\'})
+      else
+        puts "Removing #{path_to_clean}"
+        %x(rm -rf #{path_to_clean})
+      end
+
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -1,8 +1,16 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
+require 'codeclimate-test-reporter'
 require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+
+# The order of these is very important for making them all work together.
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter,
+  CodeClimate::TestReporter::Formatter # this has to be last or reporting fails.
+]
+SimpleCov.start 'rails' # without 'rails' this doesn't work right.
+
 
 require 'pry'
 require 'puppet/moddeps'
+require 'rbconfig'

metadata

@@ -1,206 +1,227 @@
 --- !ruby/object:Gem::Specification
 name: puppet-moddeps
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - GeneBean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: wdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-description: ! "    This gem will allow you to pull in all missing dependencies for
-  a given\n    Puppet module. This is targeted specifically at private modules that
-  have a\n    populated metadata.json file.\n"
+description: |2
+      This gem will allow you to pull in all missing dependencies for a given
+      Puppet module. This is targeted specifically at private modules that have a
+      populated metadata.json file.
 email:
 - me@technicalissues.us
 executables:
@@ -208,9 +229,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -235,17 +257,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: Installs dependencies for a given Puppet module