falkorlib 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395609cb7eea10171f370b653926e3f45d1ec4fb
-  data.tar.gz: 4c1be259201f3f86178f6538930d2c62cbc727bf
+  metadata.gz: 268cbfbe13bf123bf09deb6b4ecb48ea73bb7c47
+  data.tar.gz: fd2d6faf23d9a783012e40e85f61be0109939e79
 SHA512:
-  metadata.gz: c373d7743ad2a45ec4a5f452d25ae24dc10476c12a879b3c8b8133287f1e4f22672c646aec4a40e77de138d588fcb102450b12d63c065ca434da55f14442e684
-  data.tar.gz: 43e3a90e07c2dac1298a096be8c1ea27fc450d2fcd0b130e64b642660ced449348c50b54a67d8ea8f52f820b813baf27a31f7f322daa4c713fe34ecf62c8e599
+  metadata.gz: f8c3ef80d9c7704651ac8b20e11ed8ef3e62e0dd884ef57447947bf8ec577094c3668ad6b5492fd0736fdb83b4f123c64997ad14f0e3f3631ac815daecf84390
+  data.tar.gz: bddd9304358b05d2c26297bf1d067f440588c0f679c86d4c9d60695b769c663fb0f82d9eae8d0d00b919f6d538f1aa42b8b4d802f862563a3e4d81488f59255d

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.3.2)
+    falkorlib (0.3.3)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       git_remote_branch (~> 0)
       json (~> 1.8)
-      license-generator
+      license-generator (~> 0)
       minigit (~> 0)
       rake (~> 10.1, >= 10.1.0)
       term-ansicolor (~> 1.3)
@@ -103,7 +103,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  codeclimate-test-reporter
+  codeclimate-test-reporter (~> 0)
   falkorlib!
   pry (~> 0.9)
   rspec (~> 2.7, >= 2.7.0)

data/falkorlib.gemspec

@@ -131,7 +131,7 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency("configatron",    "~> 3.2")
 	s.add_runtime_dependency("awesome_print", "~> 1.2")
 	s.add_runtime_dependency("json", "~> 1.8")
-	s.add_runtime_dependency("license-generator")
+	s.add_runtime_dependency("license-generator", '~> 0')
 
     #
     # One call to add_dependency('gem_name', 'gem version requirement') for each
@@ -149,7 +149,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency("travis",        "~> 1.6")
     s.add_development_dependency("travis-lint",   "~> 1.8")
 	
-	s.add_development_dependency("codeclimate-test-reporter") #, group: :test, require: nil)
+	s.add_development_dependency("codeclimate-test-reporter", '~> 0') #, group: :test, require: nil)
     #s.add_development_dependency("bluecloth",      "~> 2.2.0")
     #s.add_development_dependency("wlang",          "~> 0.10.2")
 

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2014-08-28 23:02 svarrette>
+# Time-stamp: <Sat 2014-08-30 14:24 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -25,10 +25,10 @@ module FalkorLib  #:nodoc:
                         :mail         => "#{ENV['GIT_AUTHOR_EMAIL']}",
                         :summary      => "rtfm",
                         :description  => '',
-                        :license      => 'GPLv3',
+                        :license      => 'Apache-2.0',
                         :source       => '',
                         :project_page => '',
-                        :issue_url    => '',
+                        :issues_url   => '',
                         :dependencies => [],
                         :operatingsystem_support => [],
                         :tags         => []
@@ -69,7 +69,7 @@ module FalkorLib  #:nodoc:
 	            error "Undefined type #{type}" if t.empty?	            
                 result = []
                 Dir["#{moduledir}/manifests/**/*.pp"].each do |ppfile|
-		            File.read(ppfile).scan(/^[ \t]*#{t}[\s]+([0-9a-zA-z:]+).*$/).each do |line|
+		            File.read(ppfile).scan(/^[ \t]*#{t}[\s]+([0-9a-zA-z:-]+).*$/).each do |line|
                         result << line[0]
                     end
                 end
@@ -97,7 +97,7 @@ module FalkorLib  #:nodoc:
                                          config[:source].nil? ? v : config[:source]
                                      when :name
                                          File.basename(rootdir).gsub(/^puppet-/, '')
-                                     when :issue_url
+                                     when :issues_url
                                          config[:project_page].nil? ? v : "#{config[:project_page]}/issues"
                                      when :description
                                          config[:summary].nil? ? v : "#{config[:summary]}"
@@ -111,9 +111,12 @@ module FalkorLib  #:nodoc:
                 name = config[:name].gsub(/.*-/, '')
 	            tags = ask("\tKeywords (comma-separated list of tags)", name)
                 config[:tags] = tags.split(',')
-                license = select_from(FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses],
+	            list_license    = FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses]
+	            default_license = FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata][:license]
+	            idx = list_license.index(default_license) unless default_license.nil?
+	            license = select_from(list_license,
                                       'Select the license index for the Puppet module:',
-                                      1)
+	                                  idx.nil? ? 1 : idx + 1)
                 config[:license] = license.downcase unless license.empty?
                 puts "\t" + sprintf("%-20s", "Module License:") + config[:license]
 
@@ -148,7 +151,7 @@ module FalkorLib  #:nodoc:
                 if FalkorLib::Git.init?(moduledir)
                     if FalkorLib::GitFlow.init?(moduledir)
                         info "=> preparing git-flow feature for the newly created module '#{config[:name]}'"
-                        FalkorLib::GitFlow.start('feature', "init_#{name}", moduledir)
+                        FalkorLib::GitFlow.start('feature', "bootstraping", moduledir)
                     end
                     [ 'metadata.json', 'LICENSE', '.gitignore', 'Gemfile', 'Rakefile'].each do |f|
                         FalkorLib::Git.add(File.join(moduledir, f))
@@ -183,20 +186,26 @@ module FalkorLib  #:nodoc:
 	            end
 	            if ! deps.empty?
 		            deps.each do |l| 
+			            shortname = name.gsub(/.*-/, '')
+			            shortmetaname = metadata["name"].gsub(/.*-/, '')
+			            next if [name, metadata["name"], name.gsub(/.*-/, ''), metadata["name"].gsub(/.*-/, '') ].include? ( l )  
 			            warn "The module '#{l}' is missing in the dependencies thus added"
-			            login = ask("[Github] login for the module '#{lib}'")
+			            login = ask("[Github] login for the module '#{l}'")
 			            version = ask("Version requirement (ex: '>=1.0.0 <2.0.0' or '1.2.3' or '1.x')")
 			            metadata["dependencies"] << {
-				            "name"                => "#{login}/#{lib}",
+				            "name"                => "#{login}/#{l}",
 				            "version_requirement" => "#{version}"
 			            }
 		            end
-		            warn "About to commit these changes in the '#{name}/metadata.json' file"
-		            really_continue?
-		            File.open(jsonfile,"w") do |f|
-			            f.write JSON.pretty_generate( metadata )
-		            end
 	            end
+	            info "Metadata configuration for the module '#{name}'"
+	            puts JSON.pretty_generate( metadata )
+	            warn "About to commit these changes in the '#{name}/metadata.json' file"
+	            really_continue?
+	            File.open(jsonfile,"w") do |f|
+		            f.write JSON.pretty_generate( metadata )
+	            end
+
             end # parse
 
 

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, 3, 2  
+	    MAJOR, MINOR, PATCH = 0, 3, 3  
 	    
 	    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: <Fri 2014-08-29 11:32 svarrette>
+# Time-stamp: <Sat 2014-08-30 15:28 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -36,8 +36,14 @@ describe FalkorLib::Puppet::Modules do
 		moduledir = File.join(dir, name) 
 
         it "#init -- create a puppet module" do
-			Array.new(26).each { |e|  STDIN.should_receive(:gets).and_return('') }
+			# Prepare answer to the questions
+			Array.new(11).each { |e|  STDIN.should_receive(:gets).and_return('') }
+			STDIN.should_receive(:gets).and_return('Yes') ## initialize/update the directory
+			Array.new(14).each { |e|  STDIN.should_receive(:gets).and_return('') }
+            STDIN.should_receive(:gets).and_return('')   ## RVM version
+			STDIN.should_receive(:gets).and_return(name) ## RVM gemset
 			STDIN.should_receive(:gets).and_return('No')
+
             FalkorLib::Puppet::Modules.init(moduledir)
             templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
             s = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,14 +118,14 @@ dependencies:
   name: license-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -236,14 +236,14 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: "This is my personal library I use to share the Ruby tidbits, Rake and