falkorlib 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b087ab11950e193ccd65ee4139b55641d00afe
-  data.tar.gz: 9c0addcd32c2e2f4c4f42cd8ef82173b351fd641
+  metadata.gz: 24b688866a7028d56fb245d36207f12b727484ed
+  data.tar.gz: 3ceb29d135eeb2f9273fb51bd5c9efd560897337
 SHA512:
-  metadata.gz: 38b0b4b09e4535c68c63ff4df89bf67eb268b7547c637679e50a5e0c8894090113c3a39e3ae3708d1605cac75c8e1d629f16cba408e9b46a51670cea8f537f6a
-  data.tar.gz: ee95891a9412a8ebe66d124a56aa8f59d6ccbcc4553dcfc3f4d36e14abcfa32e46d64b7503ded8fd3287fa5c4e42fdc7dfa2dc2ef2bac82eb905ceeb7b5c75ec
+  metadata.gz: 9dab597ad919ab7b58606cd89d295f463a7a3c05e4e132cdebea876bed110286ce640c21d63acf0a3f01084c29419c02ec638fdee859cc00fe43fd23171d0611
+  data.tar.gz: b330a6ec0382afd5035005a95caa940a2a0a4440b67409d35312edf6181b549afa0de3a7aff6717b17431174ada84b8b50ed783d290e0b0365837ced27d67328

data/Gemfile.lock

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

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 21:58 svarrette>
+# Time-stamp: <Mer 2015-02-25 00:02 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -34,7 +34,7 @@ module FalkorLib  #:nodoc:
                              :tags         => []
                             },
                :trashdir => '.Trash',
-               :types    => [ :latex, :gem, :octopress, :puppet_module, :rvm, :pyenv ],
+               :types    => [ :none, :latex, :gem, :octopress, :puppet_module, :rvm, :pyenv ],
                :licenses => {
                              "none"       => {},
                              "Apache-2.0" => {
@@ -181,6 +181,7 @@ module FalkorLib
         ###### repo ######
         # Initialize a Git repository for a project with my favorite layout
         # Supported options:
+        # * :no_interaction [boolean]: do not interact
         # :interactive [boolean] Confirm Gitflow branch names
         # :master      [string]  Branch name for production releases
         # :develop     [string]  Branch name for development commits
@@ -315,6 +316,7 @@ module FalkorLib
         ###### readme ######
         # Bootstrap a README file for various context
         # Supported options:
+        #  * :no_interaction [boolean]: do not interact
         #  * :force     [boolean] force overwritting
         #  * :latex     [boolean] describe a LaTeX project
         #  * :octopress [boolean] octopress site
@@ -333,7 +335,7 @@ module FalkorLib
             config[:type] << :latex if options[:latex]
             if config[:type].empty?
                 t = select_from( FalkorLib::Config::Bootstrap::DEFAULTS[:types],
-                                'Select the type of project to describe:')
+                                'Select the type of project to describe:', 1)
                 config[:type] << t
                 config[:type] << [ :ruby, :rvm ] if [ :gem, :rvm, :octopress, :puppet_module ].include?( t )
                 config[:type] << :python if t == :pyenv

data/lib/falkorlib/cli/new.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 22:03 svarrette>
+# Time-stamp: <Mer 2015-02-25 00:05 svarrette>
 ################################################################################
 
 require 'thor'
@@ -107,7 +107,6 @@ These files will be committed in Git to ensure a consistent environment for the
       #......................................
       desc "readme PATH [options]", "Initiate a README file in the PATH directory ('./' by default)"
       def readme(path = '.')
-          ap options
           FalkorLib::Bootstrap.readme(path, options)
       end # readme
     end # class Init

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 22:09 svarrette>
+# Time-stamp: <Mar 2015-02-24 23:50 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -84,6 +84,7 @@ module FalkorLib #:nodoc:
 
         ## Ask a question
         def ask(question, default_answer='')
+            return default_answer if FalkorLib.config[:no_interaction]
             print "#{question} "
             print "[Default: #{default_answer}]" unless default_answer == ''
             print ": "
@@ -94,6 +95,7 @@ module FalkorLib #:nodoc:
 
         ## Ask whether or not to really continue
         def really_continue?(default_answer = 'Yes')
+            return if FalkorLib.config[:no_interaction]
             pattern = (default_answer =~ /yes/i) ? '(Y|n)' : '(y|N)'
             answer = ask( cyan("=> Do you really want to continue #{pattern}?"), default_answer)
             exit 0 if answer =~ /n.*/i

data/lib/falkorlib/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-02-24 11:58 svarrette>
+# Time-stamp: <Mer 2015-02-25 00:19 svarrette>
 ################################################################################
 # FalkorLib Configuration
 #
@@ -41,14 +41,15 @@ module FalkorLib #:nodoc:
     module Config #:nodoc:
         # Defaults global settings
         DEFAULTS = {
-                    :debug        => false,
-                    :verbose      => false,
-                    :root         => Dir.pwd,
-                    :config_files => {
-                                      :local   => '.falkor/config',
-                                      :private => '.falkor/private',
-                                      #:project => '.falkor/project',
-                                     },
+                    :debug          => false,
+                    :verbose        => false,
+                    :no_interaction => false,
+                    :root           => Dir.pwd,
+                    :config_files   => {
+                                        :local   => '.falkor/config',
+                                        :private => '.falkor/private',
+                                        #:project => '.falkor/project',
+                                       },
                     #:custom_cfg   => '.falkorlib.yaml',
                     :rvm => {
                              :rubies      => [ '1.9.3', '2.0.0', '2.1.0'],
@@ -69,7 +70,7 @@ module FalkorLib #:nodoc:
         ## Build the default configuration hash, to be used to initiate the default.
         # The hash is built depending on the loaded files.
         def default
-            res = FalkorLib::Config::DEFAULTS
+            res = FalkorLib::Config::DEFAULTS.clone
             $LOADED_FEATURES.each do |path|
                 res[:git]        = FalkorLib::Config::Git::DEFAULTS        if path.include?('lib/falkorlib/git.rb')
                 res[:gitflow]    = FalkorLib::Config::GitFlow::DEFAULTS    if path.include?('lib/falkorlib/git.rb')
@@ -95,31 +96,37 @@ module FalkorLib #:nodoc:
         #  * :file [string] filename for the local configuration
         ##
         def get(dir = Dir.pwd, type = :local, options = {})
-            path = normalized_path(dir)
-            path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
-            raise FalkorLib::Error, "Wrong FalkorLib configuration type" unless FalkorLib.config[:config_files].keys.include?( type.to_sym)
-            local_config_file = options[:file] ? options[:file] : File.join(path, FalkorLib.config[:config_files][type.to_sym])
+            conffile = config_file(dir,type,options)
             res = {}
-            res = load_config( local_config_file ) if File.exists?( local_config_file )
+            res = load_config( conffile ) if File.exists?( conffile )
             res
         end # get
 
+        ###### get_or_save ######
+        # wrapper for get and save operations
+        ##
+        def config_file(dir = Dir.pwd, type = :local, options = {})
+            path = normalized_path(dir)
+            path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
+            raise FalkorLib::Error, "Wrong FalkorLib configuration type" unless FalkorLib.config[:config_files].keys.include?( type.to_sym)
+            return options[:file] ? options[:file] : File.join(path, FalkorLib.config[:config_files][type.to_sym])
+        end # get_or_save
+
+        
         ###### save ######
         # save the { local | private } configuration on YAML format
         # Supported options:
         #  * :file [string] filename for the saved configuration
+        #  * :no_interaction [boolean]: do not interact
         ##
         def save(dir = Dir.pwd, config = {}, type = :local, options = {})
-            path = normalized_path(dir)
-            path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
-            raise FalkorLib::Error, "Wrong FalkorLib configuration type"unless  FalkorLib.config[:config_files].keys.include?( type.to_sym)
-            conffile = options[:file] ? options[:file] : File.join(path, FalkorLib.config[:config_files][type.to_sym])
+            conffile = config_file(dir,type,options)
             confdir  = File.dirname( conffile )
             unless File.directory?( confdir )
-                really_continue? "about to create the configuration directory #{confdir}"
+                really_continue? "about to create the configuration directory #{confdir}" unless options[:no_interaction]
                 run %{ mkdir -p #{confdir} }
             end
-            store_config(conffile, config)
+            store_config(conffile, config, options)
         end # save
 
     end

data/lib/falkorlib/tasks/rspec.rake

@@ -36,6 +36,7 @@ begin
         #t.pattern = "spec/**/bootstrap*spec.rb"
         #t.pattern = "spec/**/gitf*spec.rb"
         #t.pattern = "spec/**/error*spec.rb"
+        #t.pattern = "spec/**/config*spec.rb"
 
         # Whether or not to fail Rake when an error occurs (typically when
         # examples fail).

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, 2  
+	    MAJOR, MINOR, PATCH = 0, 4, 3  
 	    
 	    module_function
 	    

data/spec/falkorlib/bootstrap_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # bootstrap_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sam 2015-01-24 19:05 svarrette>
+# Time-stamp: <Mer 2015-02-25 00:03 svarrette>
 #
 # @description Check the Bootstrapping operations
 #
@@ -20,9 +20,9 @@ describe FalkorLib::Bootstrap do
 
     dirs = {
         :without_git => Dir.mktmpdir,
-        :with_git    => Dir.mktmpdir
+        :with_git    => Dir.mktmpdir,
+        :default     => Dir.mktmpdir
     }
-
     before :all do
         $stdout.sync = true
     end
@@ -31,6 +31,7 @@ describe FalkorLib::Bootstrap do
         dirs.each do |t,d|
             FileUtils.remove_entry_secure d
         end
+        FalkorLib.config[:no_interaction] = false
     end
 
     [ :without_git, :with_git ].each do |ctx|
@@ -111,8 +112,59 @@ describe FalkorLib::Bootstrap do
                 content[:gemsetfile].should  == opts[:gemset]
             end
 
+            it "#select_forge - none" do
+			    STDIN.should_receive(:gets).and_return('1')
+                t = FalkorLib::Bootstrap.select_forge()
+                t.should == :none
+            end
+
+            it "#select_forge -- default to github" do
+                STDIN.should_receive(:gets).and_return('')
+                t = FalkorLib::Bootstrap.select_forge(:github)
+                t.should == :github
+            end
+
+            FalkorLib::Config::Bootstrap::DEFAULTS[:licenses].keys.each do |lic|
+                it "#select_licence -- default to #{lic}" do
+                    STDIN.should_receive(:gets).and_return('')
+                    t = FalkorLib::Bootstrap.select_licence(lic)
+                    t.should == lic
+                end
+            end
+
+            it "#get_badge " do
+                subject = 'licence'
+                status  = 'GPL-2.0'
+                t = FalkorLib::Bootstrap.get_badge(subject, status)
+                t.should =~ /#{subject}/
+                t.should =~ /#{status.sub(/-/, '--')}/
+            end
+
+            it "#readme" do
+                #Array.new(6).each { |e|  STDIN.should_receive(:gets).and_return('') }
+                #STDIN.should_receive(:gets).and_return('')
+                #STDIN.should_receive(:gets).and_return('1')
+                FalkorLib.config[:no_interaction] = true
+                FalkorLib::Bootstrap.readme(dir, { :no_interaction => true })
+                t = File.exists?(File.join(dir, 'README.md'))
+                t.should be_true
+                FalkorLib.config[:no_interaction] = false
+            end
         end # context
 
     end # each
+    
+    ############################################
+    context 'boostrap repo' do
+        dir = dirs[:default]
+        
+        it '#repo' do
+            FalkorLib.config[:no_interaction] = true
+            FalkorLib::Bootstrap.repo(dir, { :no_interaction => true })
+            FalkorLib.config[:no_interaction] = false
+        end
+
+    end
 
+    
 end

data/spec/falkorlib/config_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe FalkorLib::Config do
+
+    include FalkorLib::Common
+
+	dir   = Dir.mktmpdir
+    test_hash = {
+                    :str   => "simple string",
+                    :array => [ 'a', 'b' ],
+                    :hash  => {
+                               :key => 'val'
+                              }
+                   }
+    
+    after :all do
+        FileUtils.remove_entry_secure dir
+    end
+
+	#############################################
+    context "Test default configuration object" do
+
+		it "#default" do
+            hash = FalkorLib::Config.default
+            t = hash.is_a? Hash
+            t.should be_true
+            hash[:rvm][:versionfile].should == FalkorLib::Config::DEFAULTS[:rvm][:versionfile]
+        end
+
+        it "#save" do
+            FalkorLib::Config.save(dir, test_hash, :local, { :no_interaction => true })
+            t = File.exists?( File.join(dir, FalkorLib::Config::DEFAULTS[:config_files][:local]))
+            t. should be_true
+        end
+
+        it "#get" do
+            h = FalkorLib::Config.get(dir, :local, { :no_interaction => true })
+            h.should == test_hash
+        end
+
+	end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sebastien Varrette
@@ -379,6 +379,7 @@ files:
 - lib/falkorlib/versioning.rb
 - spec/falkorlib/bootstrap_spec.rb
 - spec/falkorlib/common_spec.rb
+- spec/falkorlib/config_spec.rb
 - spec/falkorlib/error_spec.rb
 - spec/falkorlib/git_spec.rb
 - spec/falkorlib/gitflow_spec.rb
@@ -440,6 +441,7 @@ summary: Sebastien Varrette aka Falkor's Common library to share Ruby code and {
 test_files:
 - spec/falkorlib/bootstrap_spec.rb
 - spec/falkorlib/common_spec.rb
+- spec/falkorlib/config_spec.rb
 - spec/falkorlib/error_spec.rb
 - spec/falkorlib/git_spec.rb
 - spec/falkorlib/gitflow_spec.rb