puppet-moddeps 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWIwMjA1YzZmN2QyZjlkM2M2YTIxZjlkZDYwOWZkZDU0NjNjYWI2Yg==
+    MWY4NmZmNmVlOWY5Yjk5NDIwMmUxZGFjMTg3MDhmMTE2ZjgwN2IyOA==
   data.tar.gz: !binary |-
-    YjY3Y2IzNTY5NTA4MGE1YzRkZDdjZmU4MTRiOTY2NmRkNWIyMTVmOQ==
+    OTQzOTczYWYzNGRhZDNlN2RmZTljMjAwODZmM2ZiNmViNTEzNjlhMA==
 SHA512:
   metadata.gz: !binary |-
-    ZjYxMTY5ODI1OWExZDAxMzVkNThlMzg5Njc2YjM3MjgzMGM3OWJkMzE1Mzc3
-    YWRiMjljYzk2ODQwZTNhNjE1MzEwZmRiYjBmZjM3MjNhMmU1NGM2NjQyOGFi
-    ZWYyY2NkMDQ5Mzc5OTE1NmEwZGE4ZThjYTc5NjY2NjYwZGVjMzM=
+    ZTQ2ZDE3MmQzYmJkYTYyYjlkNTQ4MWI4ODhlZjU0NjFhYjRjZTU0MmU2OGVh
+    MGM5ZDg5ZDZkMjIyZmQyNjc4MjdlZGU0Mzk3MzdjNWQyNGQ3NzVmOTkxYzhm
+    ZjdjNzQ3NTgxY2VlMDE0NDgxNWY2YmI5ZDU5MmRmNWU2M2VmOTU=
   data.tar.gz: !binary |-
-    MDBhMmZhODBmNzdlZjdlZTZjZmIyZWZkNDQzZTEwYzQ0MDYzNTYyOGIyMjQz
-    YjhjNmZlMTdlODNjZDI1OGY3YTVmNjAxYzFjODI3NjQzOWMyZDQ4NjA5NWQx
-    NjY4OWQzNTYzMDA0ZjY5MGY0MmNmYzU1MjU2YTUzN2JlNzEzNjQ=
+    MTYyY2Y0MThiZWQ4MDI4NzhmZDAxZjU5NWVlM2UzOGM3NDYwNGY3MzdlYWVj
+    ZWQxOGQwZjcyNDViODJmNTQ1YTcwNDRlMDBmOGM4MmEyYWU3YzJiZDAzNjYz
+    MjE4NDcxNGU2YjFlMmU2MTA2YzhiZjMxODY0MTVlZWIzNDBlNWY=

data/.gitignore

@@ -1,7 +1,7 @@
 /.bundle/
 /.vagrant/
 /.yardoc
-#/Gemfile.lock
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -22,3 +22,4 @@ mkmf.log
 /vendor
 
 /.c9/
+/.idea/

data/.travis.yml

@@ -5,18 +5,8 @@ rvm:
   - 2.0.0
   - 2.1.1
 
-before_install:
-  - wget https://apt.puppetlabs.com/puppetlabs-release-precise.deb
-  - sudo dpkg -i puppetlabs-release-precise.deb
-  - sudo apt-get update -qq
-  - sudo apt-get install -y puppet > /dev/null
-  - sudo chmod 777 /etc/puppet/modules
-  - moddir='/etc/puppet/modules/fake_private_module'
-  - mkdir "$moddir"
-  - echo '{"dependencies":[' >> "$moddir/metadata.json"
-  - echo '{"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"},' >> "$moddir/metadata.json"
-  - echo '{"name":"puppetlabs/concat","version_requirement":">= 1.1.1"},' >> "$moddir/metadata.json"
-  - echo '{"name":"puppetlabs/firewall","version_requirement":">= 1.3.0"}]}' >> "$moddir/metadata.json"
+env:
+ - PUPPET_VERSION=3.7.3
 
 script: 'bundle exec rake'
 

data/Guardfile

@@ -2,11 +2,22 @@
 # vi: set ft=ruby :
 
 guard 'rspec', cmd: 'bundle exec rspec' do
+
+  # watch /lib files
+  watch(%r{^lib/(.+).rb$}) do |m|
+    "spec/#{m[1]}_spec.rb"
+  end
+
   # watch /lib/puppet files
   watch(%r{^lib/puppet/(.+).rb$}) do |m|
     "spec/#{m[1]}_spec.rb"
   end
 
+  # watch /lib/puppet/moddeps files
+  watch(%r{^lib/puppet/moddeps(.+).rb$}) do |m|
+    "spec/#{m[1]}_spec.rb"
+  end
+
   # watch /spec/ files
   watch(%r{^spec/(.+).rb$}) do |m|
     "spec/#{m[1]}.rb"

data/README.md

@@ -12,18 +12,17 @@
 [![Build Status][travis-img-develop]][travis-ci]
 [![Coverage Status][coveralls-img-develop]][coveralls-develop]
 
-## I work!
-
-**This gem DOES run successfully** using the system ruby on CentOS 6 (v1.8.7).
-The broken build status is a result of how [RVM][rvm] changes the environment
-and is something that is being investigated.
-
 ## Description
 
 This gem will allow you to pull in all missing dependencies for a given Puppet
 module. This is targeted specifically at private modules or modules cloned from
 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..
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Vagrantfile

@@ -12,9 +12,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     dev.vm.synced_folder "./", "/home/vagrant/puppet-moddeps"
 
     dev.vm.provision "shell", inline: "yum -y install dos2unix git nano ruby-devel tree vim-enhanced"
-    dev.vm.provision "shell", inline: "dos2unix /vagrant/scripts/vagrant-user.sh"
-    dev.vm.provision "shell", inline: "su - vagrant -c '/vagrant/scripts/vagrant-user.sh'"
-    dev.vm.provision "shell", path:   "scripts/pretest.sh"
+    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
 

data/bin/puppet-moddeps

@@ -2,4 +2,5 @@
 
 require 'puppet/moddeps'
 
-Puppet::Moddeps.installDeps(ARGV)
+depinstaller = Puppet::Moddeps::InstallDeps.new
+depinstaller.install(ARGV)

data/lib/puppet/moddeps/install_deps.rb

@@ -0,0 +1,93 @@
+require 'rubygems'
+require 'json'
+
+module Puppet
+  module Moddeps
+    class InstallDeps
+
+      attr_reader :module_path, :deps
+
+      def initialize(path=nil, deps=nil)
+        if path and path.is_a?(String)
+          @module_path = path
+        elsif path
+          abort('The provided path was not a string.')
+        else
+          @module_path = %x(puppet config print modulepath).split(':')[0]
+        end
+
+        if deps and deps.is_a?(Array)
+          @deps = deps
+        elsif deps
+          abort('The provided dependency list was not an array.')
+        else
+          @deps = []
+        end
+      end
+
+      def install(*puppet_module)
+
+        if puppet_module.size >=1 and puppet_module[0].is_a?(Array)
+          args = puppet_module[0]
+        else
+          args = puppet_module
+        end
+
+        if args.size == 1
+          if installed?(args[0])
+            self.parse_metadata(args[0])
+            self.install_modules
+          else
+            puts "Can't find #{args[0]} in #{@module_path}"
+          end
+        else
+          self.help
+        end
+      end
+
+      def help
+        puts 'Usage: puppet-moddeps module'
+        puts '       Call puppet-moddeps with the name of one installed module'
+      end
+
+      def installed?(module_name)
+        File.directory?("#{@module_path}/#{module_name}")
+      end
+
+      def parse_metadata(module_name)
+        metadata = File.read("#{@module_path}/#{module_name}/metadata.json")
+        data     = JSON.parse(metadata)
+        self.parse_deps(data)
+      end
+
+      def parse_deps(data)
+        @deps.clear
+
+        data['dependencies'].each do |dep|
+          depname = dep["name"].sub '/', '-'
+          @deps.push( depname )
+        end
+      end
+
+      def install_modules
+        if @deps.size > 0
+
+          puts "Modules will be installed into #{module_path}"
+
+          @deps.each do |dep|
+            if self.installed?(dep)
+              puts "#{dep} is already installed, skipping."
+            else
+              cmd = "puppet module install #{dep}"
+              puts "Running \"#{cmd}\"..."
+              %x(#{cmd})
+            end
+          end
+        else
+          puts 'No dependencies were marked for installation.'
+        end
+      end
+
+    end
+  end
+end

data/lib/puppet/moddeps/version.rb

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

data/lib/puppet/moddeps.rb

@@ -1,72 +1,8 @@
+require 'puppet/moddeps/install_deps'
 require 'puppet/moddeps/version'
-require 'rubygems'
-require 'json'
 
 module Puppet
   module Moddeps
 
-    @@default_module_path = '/etc/puppet/modules'
-
-    def Moddeps.installDeps(*puppet_module)
-
-      if ( puppet_module.size >=1 and puppet_module[0].is_a?(Array) )
-        args = puppet_module[0]
-      else
-        args = puppet_module
-      end
-
-      if ( args.size == 1 )
-        if Moddeps.checkIfInstalled(args[0])
-          Moddeps.parseMetadata(args[0])
-          Moddeps.installModules
-        else
-          puts "Can't find #{args[0]} in #{@@default_module_path}"
-        end
-      else
-        Moddeps.help
-      end
-    end
-
-    def Moddeps.help
-      puts 'Usage: puppet-moddeps module'
-      puts '       Call puppet-moddeps with the name of one installed module'
-    end
-
-    def Moddeps.checkIfInstalled(file)
-      File.directory?("#{@@default_module_path}/#{file}")
-    end
-
-    def Moddeps.parseMetadata(puppet_module)
-      metadata = File.read("#{@@default_module_path}/#{puppet_module}/metadata.json")
-      data     = JSON.parse(metadata)
-      @deps    = Moddeps.getDeps(data)
-    end
-
-    def Moddeps.getDeps(data)
-      dependencies = []
-      data['dependencies'].each do |dep|
-        depname = dep["name"].sub '/', '-'
-        dependencies.push( depname )
-      end
-
-      return dependencies
-    end
-
-    def Moddeps.installModules
-      if @deps.size > 0
-        @deps.each do |dep|
-          if Moddeps.checkIfInstalled(dep)
-            puts "#{dep} is already installed, skipping."
-          else
-            cmd = "/usr/bin/puppet module install #{dep}"
-            puts "Running \"#{cmd}\"..."
-            %x(#{cmd})
-          end
-        end
-      else
-        puts 'No dependencies were marked for installation.'
-      end
-    end
-
   end
 end

data/puppet-moddeps.gemspec

@@ -37,5 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'rspec-nc', '~> 0.2'
 
+  if ENV.key?('PUPPET_VERSION')
+    puppetversion = "= #{ENV['PUPPET_VERSION']}"
+  else
+    puppetversion = ['>= 3.0', '< 4.0']
+  end
+  spec.add_development_dependency 'puppet', puppetversion
+
   spec.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1'
 end

data/spec/install_deps_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+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]
+  end
+
+  describe '.initialize(path, deps)' do
+
+    it 'should set the default module path and deps list' do
+      base_obj = Puppet::Moddeps::InstallDeps.new
+
+      expect(base_obj.module_path).to eq(@expected_path)
+      expect(base_obj.deps).to match_array []
+    end
+
+    it 'should use the provided values' do
+      base_obj = Puppet::Moddeps::InstallDeps.new('/tmp', ['dep1', 'dep2'])
+      expect(base_obj.module_path).to eq('/tmp')
+      expect(base_obj.deps).to contain_exactly('dep1', 'dep2')
+    end
+
+    it 'should fail when an array is passed to path' do
+      expect { Puppet::Moddeps::InstallDeps.new(['dep1', 'dep2']) }.to raise_error(SystemExit, 'The provided path was not a string.' )
+    end
+
+    it 'should fail when an string is passed to deps' do
+      expect { Puppet::Moddeps::InstallDeps.new('arg1', 'arg2') }.to raise_error(SystemExit, 'The provided dependency list was not an array.' )
+    end
+
+  end
+
+  describe '.install(puppet_module) feedback verification' do
+
+    before(:each) do
+      @base_object = Puppet::Moddeps::InstallDeps.new
+    end
+
+    context 'with no parameters' do
+      it 'should print usage info' do
+        expect { @base_object.install }.to output(/Usage.*/).to_stdout
+      end
+    end
+
+    context 'with two or more parameters' do
+      it 'should print usage info' do
+        expect { @base_object.install('arg1', 'arg2') }.to output(/Usage.*/).to_stdout
+      end
+    end
+
+    context 'with one parameter' do
+      it 'should print usage if multiple arguments come in as an array' do
+        params = ['arg1', 'arg2']
+        expect { @base_object.install(params) }.to output(/Usage.*/).to_stdout
+      end
+
+      it 'should print usage if an empty array is passed in' do
+        params = []
+        expect { @base_object.install(params) }.to output(/Usage.*/).to_stdout
+      end
+
+      it 'should fail if the parameter is not an installed module' do
+        expect { @base_object.install('fake_missing_module') }.to output(/Can\'t find fake_missing_module in.*/).to_stdout
+      end
+
+    end
+
+  end
+
+  describe '.parse_metadata' do
+
+    it "should parse metadata.json" do
+      base_object = Puppet::Moddeps::InstallDeps.new
+
+      base_object.parse_metadata('apache')
+
+      expect(base_object.deps).to contain_exactly('puppetlabs-stdlib', 'puppetlabs-concat')
+    end
+
+  end
+
+  describe '.install_modules' do
+
+    before(:all) do
+      @base_object = Puppet::Moddeps::InstallDeps.new
+    end
+
+    it 'should say the module is already installed' do
+      @base_object.instance_variable_set(:@deps, ['apache'])
+
+      expect { @base_object.install_modules }.to output(/apache is already installed.*/).to_stdout
+    end
+
+    it 'should say nothing to install' do
+      @base_object.instance_variable_set(:@deps, [])
+
+      expect { @base_object.install_modules }.to output(/No dependencies were marked for installation.*/).to_stdout
+    end
+
+  end
+
+  describe '.install actual Puppet modules' do
+
+     it "should install each module in provided array" do
+       base_object = Puppet::Moddeps::InstallDeps.new
+
+       base_object.install('apache')
+
+       basedir = base_object.module_path
+
+       base_object.deps.each do |dep|
+         expect(File.directory?("#{basedir}/#{dep.split('-')[1]}")).to eql(true)
+       end
+
+     end
+
+  end
+
+  after(:all) do
+    puts "Removing all modules from #{@expected_path}"
+    %x(rm -rf #{@expected_path}/*)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-moddeps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - GeneBean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +212,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -206,11 +219,11 @@ files:
 - Vagrantfile
 - bin/puppet-moddeps
 - lib/puppet/moddeps.rb
+- lib/puppet/moddeps/install_deps.rb
 - lib/puppet/moddeps/version.rb
 - puppet-moddeps.gemspec
-- scripts/pretest.sh
 - scripts/vagrant-user.sh
-- spec/moddeps_spec.rb
+- spec/install_deps_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/genebean/puppet-moddeps
 licenses:
@@ -237,5 +250,5 @@ signing_key:
 specification_version: 4
 summary: Installs dependencies for a given Puppet module
 test_files:
-- spec/moddeps_spec.rb
+- spec/install_deps_spec.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,107 +0,0 @@
-PATH
-  remote: .
-  specs:
-    puppet-moddeps (1.0.0)
-      json (~> 1.8, >= 1.8.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    codeclimate-test-reporter (0.4.3)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    ffi (1.9.6)
-    formatador (0.2.5)
-    guard (2.10.5)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-compat (1.2.0)
-    guard-rspec (4.5.0)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hitimes (1.2.2)
-    json (1.8.1)
-    listen (2.8.4)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    multi_json (1.10.1)
-    nenv (0.1.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-nc (0.2.0)
-      rspec (>= 2.9)
-      terminal-notifier (>= 1.4)
-    rspec-support (3.1.2)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    terminal-notifier (1.6.2)
-    thor (0.18.1)
-    timers (4.0.1)
-      hitimes
-    tins (0.13.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  codeclimate-test-reporter (~> 0.4)
-  coveralls (~> 0.7)
-  guard (~> 2.10)
-  guard-rspec (~> 4.5)
-  pry (~> 0.10)
-  pry-nav (~> 0.2)
-  pry-remote (~> 0.1)
-  puppet-moddeps!
-  rake (~> 10.4)
-  rspec (~> 3.1)
-  rspec-nc (~> 0.2)

data/scripts/pretest.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-chmod 777 /etc/puppet/modules
-
-moddir='/etc/puppet/modules/fake_private_module'
-
-if [ -d "$moddir" ]; then rm -rf "$moddir"; fi
-
-mkdir "$moddir"
-
-cat > "$moddir/metadata.json" <<EOF
-{
-  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1"},
-    {"name":"puppetlabs/firewall","version_requirement":">= 1.3.0"}
-  ]
-}
-
-EOF

data/spec/moddeps_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Moddeps do
-
-  describe '.installDeps(puppet_module)' do
-
-    context 'with no parameters' do
-      it 'should print usage info' do
-
-        expect { Puppet::Moddeps.installDeps() }.to output(/Usage.*/).to_stdout
-      end
-    end
-
-    context 'with two or more parameters' do
-      it 'should print usage info' do
-        expect { Puppet::Moddeps.installDeps('arg1', 'arg2') }.to output(/Usage.*/).to_stdout
-      end
-    end
-
-    context 'with one parameter' do
-      it 'should print usage if multiple arguments come in as an array' do
-        params = ['arg1', 'arg2']
-        expect { Puppet::Moddeps.installDeps(params) }.to output(/Usage.*/).to_stdout
-      end
-
-      it 'should print usage if an empty array is passed in' do
-        params = []
-        expect { Puppet::Moddeps.installDeps(params) }.to output(/Usage.*/).to_stdout
-      end
-
-      it 'should fail if the parameter is not an installed module' do
-        expect { Puppet::Moddeps.installDeps('fake_missing_module') }.to output(/Can\'t find fake_missing_module in.*/).to_stdout
-      end
-
-      it "should parse metadata.json" do
-        deps = Puppet::Moddeps.parseMetadata('fake_private_module')
-        expect(deps).to include('puppetlabs-stdlib', 'puppetlabs-concat', 'puppetlabs-firewall')
-      end
-
-      it "should install each module in provided array" do
-        Puppet::Moddeps.installDeps('fake_private_module')
-        basedir = '/etc/puppet/modules'
-        expect("#{basedir}/stdlib").to exist
-        expect("#{basedir}/concat").to exist
-        expect("#{basedir}/firewall").to exist
-      end
-
-    end
-
-  end # end describe '.installDeps(puppet_module)'
-
-  #after(:all) do
-  #  %x(sudo rm -rf /etc/puppet/modules/*)
-  #end
-
-end