falkorlib 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c16f92e51d6e2d7c1c57fa6a021b750d144a21a
-  data.tar.gz: 23c9dc35a39ea003770ea06898d40dc9fcfd7636
+  metadata.gz: 24f2e16454b28d1ca83d3df97e64a245b1b0c01e
+  data.tar.gz: 2a4c42fc9214770ad2cf683adc8251f2ff8e4cbd
 SHA512:
-  metadata.gz: 88b479ad8371dfab0c4a30a0165e6f08ac92bee7ed79a0f2995c8f9a3e5395297983a90eb22798d3e17890cf0f9d6e9af4ed6461eda26851375af3a948882139
-  data.tar.gz: f2aeefd6c5172413a1043cb68a7e318691196fcd61d21aeb8231fd9996b34faf871700c5f93ca12993eecc04ec12bd3bfd2e148037a3740f5e0c144ceed82804
+  metadata.gz: 0d4ddf35ca1812050bdfa24c526adf855d32fe27dd2132ea9db044004a1a5463fa2726df6c18580c5d23715b6e8ca2f8ae993f18bd2cdf67cb98ab1b720a0357
+  data.tar.gz: dbe16737008ea26ac775fa79dc8100400dca0a659d4431808c60cce0b43705bb09e48b5d8ba9b82fb802431c2a133a70124f1c71772b2819734b509fd384593a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.4.7)
+    falkorlib (0.4.8)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2015-05-07 18:14 svarrette>
+# Time-stamp: <Fri 2015-05-08 11:21 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -42,8 +42,7 @@ module FalkorLib  #:nodoc:
                                   "GPL-3.0",
                                   "LGPL-2.1",
                                   "LGPL-3.0",
-                                  "MIT",
-                                  "Mozilla-2.0"
+                                  "MIT"
                                  ]
                 }
             end
@@ -121,7 +120,7 @@ module FalkorLib  #:nodoc:
                 license = select_from(list_license,
                                       'Select the license index for the Puppet module:',
                                       idx.nil? ? 1 : idx + 1)
-                config[:license] = license.downcase unless license.empty?
+                config[:license] = license unless license.empty?
                 puts "\t" + sprintf("%-20s", "Module License:") + config[:license]
 
                 # Supported platforms
@@ -149,7 +148,7 @@ module FalkorLib  #:nodoc:
                 info "Generating the License file"
                 authors = config[:author].empty? ? 'UNKNOWN' : config[:author]
                 Dir.chdir(moduledir) do
-                    run %{ licgen #{config[:license]} #{authors} }
+                    run %{ licgen #{config[:license].downcase} #{authors} }
                 end
                 info "Initialize RVM"
                 init_rvm(moduledir)

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
         # MAJOR: Defines the major version
         # MINOR: Defines the minor version
         # PATCH: Defines the patch version
-	    MAJOR, MINOR, PATCH = 0, 4, 7  
+	    MAJOR, MINOR, PATCH = 0, 4, 8  
 	    
 	    module_function
 	    

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Ven 2014-12-05 22:56 svarrette>
+# Time-stamp: <Fri 2015-05-08 11:23 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -142,7 +142,7 @@ describe FalkorLib::Puppet::Modules do
 			diff = (metadata.to_a - ref.to_a).flatten
 			diff.should == [
 			                'dependencies',
-			                {"name"=>"puppetlabs-stdlib", "version_range"=>">= 1.0.0"}, 
+			                {"name"=>"puppetlabs-stdlib", "version_requirement"=>">=4.2.2 <5.0.0"}, 
 			                {"name"=>"svarrette/tata", "version_requirement"=>"1.2"}
 			               ]
 		end

data/templates/puppet/modules/Vagrantfile

@@ -5,67 +5,45 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    # All Vagrant configuration is done here. The most common configuration
-    # options are documented and commented below. For a complete reference,
-    # please see the online documentation at vagrantup.com.
-
-    # Every Vagrant virtual environment requires a box to build off of.
-    config.vm.box = "debian-7.6.0-amd64"
-
-    # Disable automatic box update checking. If you disable this, then
-    # boxes will only be checked for updates when the user runs
-    # `vagrant box outdated`. This is not recommended.
-    # config.vm.box_check_update = false
-
-    # Create a forwarded port mapping which allows access to a specific port
-    # within the machine from a port on the host machine. In the example below,
-    # accessing "localhost:8080" will access port 80 on the guest machine.
-    # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-    # Create a private network, which allows host-only access to the machine
-    # using a specific IP.
-    # config.vm.network "private_network", ip: "192.168.33.10"
-
-    # Create a public network, which generally matched to bridged network.
-    # Bridged networks make the machine appear as another physical device on
-    # your network.
-    # config.vm.network "public_network"
-
-    # If true, then any SSH connections made will enable agent forwarding.
-    # Default value: false
-    # config.ssh.forward_agent = true
-
-    # Share an additional folder to the guest VM. The first argument is
-    # the path on the host to the actual folder. The second argument is
-    # the path on the guest to mount the folder. And the optional third
-    # argument is a set of non-required options.
-    # config.vm.synced_folder "../data", "/vagrant_data"
-
-    # Provider-specific configuration so you can fine-tune various
-    # backing providers for Vagrant. These expose provider-specific options.
-    # Example for VirtualBox:
-    #
-    # config.vm.provider "virtualbox" do |vb|
-    #   # Don't boot with headless mode
-    #   vb.gui = true
-    #
-    #   # Use VBoxManage to customize the VM. For example to change memory:
-    #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-    # end
-    #
-    # View the documentation for the provider you're using for more
-    # information on available options.
-
-    # Enable provisioning with Puppet stand alone.  Puppet manifests
-    # are contained in a directory path relative to this Vagrantfile.
-    # You will need to create the manifests directory and a manifest in
-    # the file default.pp in the manifests_path directory.
-    #
-    # config.vm.provision "puppet" do |puppet|
-    #   puppet.manifests_path = "manifests"
-    #   puppet.manifest_file  = "site.pp"
-    # end
-
-	# Enable provisioning with shell scripts
-	config.vm.provision "shell", path: ".vagrant_init.rb"
+    # Inspired by [puppet-playground](https://github.com/example42/puppet-playground/blob/master/Vagrantfile)
+    #config.cache.auto_detect = true
+
+    # (nearly) All below boxes were generated using [vagrant-vms](https://github.com/Falkor/vagrant-vms/)
+    {
+        :centos_7 => {
+            :box => "svarrette/centos-7",
+            :url => "https://atlas.hashicorp.com/svarrette/boxes/centos-7"
+        },
+        :debian_7 => {
+            :box     => "svarrette/debian-7-puppet",
+            :url     => "https://atlas.hashicorp.com/svarrette/debian-7-puppet",
+            :primary => true
+        }
+    }.each do |name,cfg|
+        boxname = name.to_s.downcase.gsub(/_/, '-')
+        config.vm.define boxname do |local|
+            local.vm.primary = true if cfg[:primary]
+            local.vm.box = cfg[:box]
+            local.vm.host_name = ENV['VAGRANT_HOSTNAME'] || name.to_s.downcase.gsub(/_/, '-').concat(".vagrant.com")
+            local.vm.provision "shell", path: ".vagrant_init.rb"
+            # local.vm.provision :puppet do |puppet|
+            #     puppet.hiera_config_path = 'data/hiera.yaml'
+            #     puppet.working_directory = '/vagrant'
+            #     puppet.manifests_path    = "manifests"
+            #     puppet.module_path       = "modules"
+            #     puppet.manifest_file     = "init.pp"
+            #     puppet.options = [
+            #         '--verbose',
+            #         '--report',
+            #         '--show_diff',
+            #         '--pluginsync',
+            #         '--summarize',
+            #         #        '--evaltrace',
+            #         #        '--debug',
+            #         #        '--parser future',
+            #     ]
+            # end
+        end
+    end
 end
+

data/templates/puppet/modules/metadata.json.erb

@@ -13,7 +13,7 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_range": ">= 1.0.0"
+      "version_requirement": ">=4.2.2 <5.0.0"
     }
   ],
   "operatingsystem_support": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake