falkorlib 0.6.19 → 0.7.0

data/spec/falkorlib/gitflow_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # gitflow_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sun 2016-10-16 22:06 svarrette>
+# Time-stamp: <Wed 2016-11-09 09:16 svarrette>
 #
 # @description Check the Git Flow operations -- see https://github.com/nvie/gitflow
 #
@@ -14,58 +14,70 @@ require 'spec_helper'
 require 'tmpdir'
 
 describe FalkorLib::GitFlow do
-    include FalkorLib::Common
+  include FalkorLib::Common
 
-    if command?('git-flow')
+  if command?('git-flow')
 
 
-        dir   = Dir.mktmpdir
-        afile = File.join(dir, 'a_file')
+    dir   = Dir.mktmpdir
+    afile = File.join(dir, 'a_file')
 
-        after :all do
-            FileUtils.remove_entry_secure dir
-        end
+    after :all do
+      FileUtils.remove_entry_secure dir
+    end
+
+    #############################################################
+    context "Test git-flow operations within temporary directory " do
 
-        #############################################################
-        context "Test git-flow operations within temporary directory " do
+      it "#init? - fails on non-git directory" do
+        t = FalkorLib::GitFlow.init?(dir)
+        expect(t).to be false
+      end
 
-            it "#init? - fails on non-git directory" do
-                t = FalkorLib::GitFlow.init?(dir)
-                expect(t).to be false
-            end
+      it "#init - initialize a git-flow repository" do
+        expect(STDIN).to receive(:gets).and_return('Yes')
+        i = FalkorLib::GitFlow.init(dir)
+        expect(i).to eq(0)
+        t = FalkorLib::Git.init?(dir)
+        expect(t).to be true
+      end
 
-            it "#init - initialize a git-flow repository" do
-                expect(STDIN).to receive(:gets).and_return('Yes')
-                i = FalkorLib::GitFlow.init(dir)
-                expect(i).to eq(0)
-                t = FalkorLib::Git.init?(dir)
-                expect(t).to be true
-            end
+      it "#init? - succeed on git-flow enabled directory" do
+        t = FalkorLib::GitFlow.init?(dir)
+        expect(t).to be true
+      end
 
-            it "#init? - succeed on git-flow enabled directory" do
-                t = FalkorLib::GitFlow.init?(dir)
-                expect(t).to be true
-            end
+      it "#branch" do
+        expected = {
+          :master  => 'production',
+          :develop => 'devel'
+        }
+        expected.each do |type,v|
+          b = FalkorLib::GitFlow.branches(type.to_sym, dir)
+          expect(b).to eq(expected[type.to_sym])
+        end
+      end
 
-            #['feature', 'hotfix', 'support'].each do |op|
-            ['feature'].each do |op|
-                name = 'toto'
-                it "#start -- should start a '#{op}' GitFlow operation" do
-                    a = FalkorLib::GitFlow.start(op, name, dir)
-                    expect(a).to eq(0)
-                    br = FalkorLib::Git.branch?( dir )
-                    expect(br).to eq("#{op}/#{name}")
-                end
 
-                it "#finish -- should finish a '#{op}' GitFlow operation" do
-                    expect(STDIN).to receive(:gets).and_return("Test #{op} operation") if [ 'hotfix', 'support' ].include?(op)
-                    a = FalkorLib::GitFlow.finish(op, name, dir)
-                    expect(a).to eq(0)
-                    br = FalkorLib::Git.branch?( dir )
-                    expect(br).to eq(FalkorLib.config[:gitflow][:branches][:develop])
-                end
-            end
+      #['feature', 'hotfix', 'support'].each do |op|
+      ['feature'].each do |op|
+        name = 'toto'
+        it "#start -- should start a '#{op}' GitFlow operation" do
+          a = FalkorLib::GitFlow.start(op, name, dir)
+          expect(a).to eq(0)
+          br = FalkorLib::Git.branch?( dir )
+          expect(br).to eq("#{op}/#{name}")
         end
 
+        it "#finish -- should finish a '#{op}' GitFlow operation" do
+          expect(STDIN).to receive(:gets).and_return("Test #{op} operation") if [ 'hotfix', 'support' ].include?(op)
+          a = FalkorLib::GitFlow.finish(op, name, dir)
+          expect(a).to eq(0)
+          br = FalkorLib::Git.branch?( dir )
+          expect(br).to eq(FalkorLib.config[:gitflow][:branches][:develop])
+        end
+      end
     end
+
+  end
 end

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sun 2016-10-16 22:06 svarrette>
+# Time-stamp: <Thu 2016-11-10 02:01 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -19,10 +19,11 @@ describe FalkorLib::Puppet::Modules do
   include FalkorLib::Common
 
   dir   = Dir.mktmpdir
+
   # Module name
   name      = 'toto'
   moduledir = File.join(dir, name)
-  jsonfile = File.join( moduledir, 'metadata.json')
+  jsonfile = File.join(moduledir, 'metadata.json')
 
   #afile = File.join(dir, 'a_file')
   # before :all do
@@ -30,8 +31,16 @@ describe FalkorLib::Puppet::Modules do
   #   ENV['GIT_AUTHOR_EMAIL'] = 'travis@domain.org' if ENV['GIT_AUTHOR_EMAIL'].nil?
   # end
 
+  #_____________
+  before :all do
+    $stdout.sync = true
+    FalkorLib.config[:no_interaction] = true
+  end
+
+  #____________
   after :all do
     FileUtils.remove_entry_secure dir
+    FalkorLib.config[:no_interaction] = false
   end
 
   #############################################################
@@ -40,7 +49,7 @@ describe FalkorLib::Puppet::Modules do
 
     it "#init -- create a puppet module" do
       # Prepare answer to the questions
-      Array.new(17).each { |e|  expect(STDIN).to receive(:gets).and_return('') }
+      #Array.new(17).each { |e|  expect(STDIN).to receive(:gets).and_return('') }
       FalkorLib::Puppet::Modules.init(moduledir)
       templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
       s = true
@@ -106,15 +115,15 @@ describe FalkorLib::Puppet::Modules do
       metadata = FalkorLib::Puppet::Modules.parse(moduledir, { :no_interaction => true })
       diff = (metadata.to_a - ref.to_a).flatten.sort
       expect(diff).to eq([
-        'classes',
-        'definitions',
-        'toto',
-        'toto::common',
-        'toto::common::debian',
-        'toto::common::redhat',
-        'toto::mydef',
-        'toto::params',
-      ])
+                           'classes',
+                           'definitions',
+                           'toto',
+                           'toto::common',
+                           'toto::common::debian',
+                           'toto::common::redhat',
+                           'toto::mydef',
+                           'toto::params',
+                         ])
     end
 
     it "#parse again -- should not exhibit any difference" do
@@ -132,20 +141,20 @@ describe FalkorLib::Puppet::Modules do
       expect(a).to include newdep
     end
 
-    it "#parse again -- should ask new dependency elements" do
-      ref      = JSON.parse( IO.read( jsonfile ) )
-      expect(STDIN).to receive(:gets).and_return('svarrette')
-      expect(STDIN).to receive(:gets).and_return('1.2')
-      expect(STDIN).to receive(:gets).and_return('Yes')
-      expect(STDIN).to receive(:gets).and_return('')
-      metadata = FalkorLib::Puppet::Modules.parse(moduledir)
-      diff = (metadata.to_a - ref.to_a).flatten
-      expect(diff).to eq([
-        'dependencies',
-        {"name"=>"puppetlabs-stdlib", "version_requirement"=>">=4.2.2 <5.0.0"},
-        {"name"=>"svarrette/tata", "version_requirement"=>"1.2"}
-      ])
-    end
+    # it "#parse again -- should ask new dependency elements" do
+    #   ref      = JSON.parse( IO.read( jsonfile ) )
+    #   expect(STDIN).to receive(:gets).and_return('svarrette')
+    #   expect(STDIN).to receive(:gets).and_return('1.2')
+    #   expect(STDIN).to receive(:gets).and_return('Yes')
+    #   expect(STDIN).to receive(:gets).and_return('')
+    #   metadata = FalkorLib::Puppet::Modules.parse(moduledir)
+    #   diff = (metadata.to_a - ref.to_a).flatten
+    #   expect(diff).to eq([
+    #                        'dependencies',
+    #                        {"name"=>"puppetlabs-stdlib", "version_requirement"=>">=4.2.2 <5.0.0"},
+    #                        {"name"=>"svarrette/tata", "version_requirement"=>"1.2"}
+    #                      ])
+    # end
 
     upgraded_files_default = 1
     it "#upgrade" do

data/spec/falkorlib/versioning_puppet_module_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # versioning_puppet_module_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Tue 2016-06-28 18:51 svarrette>
+# Time-stamp: <Thu 2016-11-10 02:04 svarrette>
 #
 # @description Check the versioning operations on Gems
 #
@@ -16,96 +16,100 @@ require 'tmpdir'
 
 describe FalkorLib::Versioning::Puppet do
 
-    include FalkorLib::Common
-
-    dir   = Dir.mktmpdir
-    name      = 'toto'
-    moduledir = File.join(dir, name)
-    default_version  = FalkorLib.config[:versioning][:default]
-
-    workingversion = {
-        :default => '4.5.6',
-        :patch   => '4.5.7',
-        :minor   => '4.6.0',
-        :major   => '5.0.0'
-    }
-
-	before :all do
-		configatron.temp_start
-		FalkorLib.config.versioning do |c|
-			c[:type] = 'puppet_module'
-		end
-	end
-
-    after :all do
-		configatron.temp_end
-        FileUtils.remove_entry_secure dir
-		FalkorLib.config.versioning[:type] = 'file'
+  include FalkorLib::Common
+
+  dir   = Dir.mktmpdir
+  name      = 'toto'
+  moduledir = File.join(dir, name)
+  default_version  = FalkorLib.config[:versioning][:default]
+
+  workingversion = {
+    :default => '4.5.6',
+    :patch   => '4.5.7',
+    :minor   => '4.6.0',
+    :major   => '5.0.0'
+  }
+
+  #_____________
+  before :all do
+    configatron.temp_start
+    FalkorLib.config[:no_interaction] = true
+    FalkorLib.config.versioning do |c|
+      c[:type] = 'puppet_module'
     end
+  end
+
+  #_____________
+  after :all do
+    configatron.temp_end
+    FileUtils.remove_entry_secure dir
+    FalkorLib.config.versioning[:type] = 'file'
+    FalkorLib.config[:no_interaction] = false
+  end
+
+  # configatron.temp do
+  #     FalkorLib.config.versioning do |c|
+  #         c[:type] = 'puppet_module'
+  #     end
+
+  ###################################################################
+  context 'Test Puppet Module versioning operations within temporary directory' do
+
+    ap default_version
+    it "#get_version -- get default version #{default_version} after initialization" do
+      #Array.new(17).each { |e|  expect(STDIN).to receive(:gets).and_return('') }
+      FalkorLib::Puppet::Modules.init(moduledir)
+      v = FalkorLib::Versioning.get_version(moduledir)
+      expect(v).to eq(default_version)
+      if command?('git-flow')
+        a = FalkorLib::GitFlow.finish('feature', 'bootstrapping', moduledir)
+        expect(a).to eq(0)
+      end
+    end
+
+    it "#set_version -- should set the '#{workingversion[:default]}' version" do
+      #expect(STDIN).to receive(:gets).and_return('Yes')
+      v = FalkorLib::Versioning.set_version(workingversion[:default], moduledir)
+      expect(v).to eq(0)
+    end
+
+    it "#get_version -- should get the '#{workingversion[:default]}'" do
+      v = FalkorLib::Versioning.get_version(moduledir)
+      expect(v).to eq(workingversion[:default])
+    end
+
+    it "#major -- should collect the major version" do
+      v = FalkorLib::Versioning.get_version(moduledir)
+      m = FalkorLib::Versioning.major(v)
+      expect(m).to eq('4')
+    end
+    it "#minor -- should collect the minor version" do
+      v = FalkorLib::Versioning.get_version(moduledir)
+      m = FalkorLib::Versioning.minor(v)
+      expect(m).to eq('5')
+    end
+    it "#patch -- should collect the patch version" do
+      v = FalkorLib::Versioning.get_version(moduledir)
+      m = FalkorLib::Versioning.patch(v)
+      expect(m).to eq('6')
+    end
+
+    #FalkorLib.config[:versioning][:levels].reverse.each do |level|
+    ['patch', 'minor'].each do |level|
+      it "#set_version #bump -- #{level} bump version number from #{workingversion[:default]} to #{workingversion[level.to_sym]}" do
+        v = FalkorLib::Versioning.get_version(moduledir)
+        expect(v).to eq(workingversion[:default])
+        v2 = FalkorLib::Versioning.bump(v, level.to_sym)
+        expect(v2).to eq(workingversion[level.to_sym])
+        #STDIN.should_receive(:gets).and_return('Yes')
+        #d = FalkorLib::Versioning.set_version(v2, moduledir)
+        #d.should == 0
+        #v3 = FalkorLib::Versioning.get_version(moduledir)
+        #v3.should == v2
+      end
+    end
+  end
 
-    # configatron.temp do
-    #     FalkorLib.config.versioning do |c|
-    #         c[:type] = 'puppet_module'
-    #     end
-
-        ###################################################################
-        context 'Test Puppet Module versioning operations within temporary directory' do
-
-            ap default_version
-            it "#get_version -- get default version #{default_version} after initialization" do
-                Array.new(17).each { |e|  expect(STDIN).to receive(:gets).and_return('') }
-                FalkorLib::Puppet::Modules.init(moduledir)
-                v = FalkorLib::Versioning.get_version(moduledir)
-                expect(v).to eq(default_version)
-                if command?('git-flow')
-                    a = FalkorLib::GitFlow.finish('feature', 'bootstrapping', moduledir)
-                    expect(a).to eq(0)
-                end
-            end
-
-            it "#set_version -- should set the '#{workingversion[:default]}' version" do
-                expect(STDIN).to receive(:gets).and_return('Yes')
-                v = FalkorLib::Versioning.set_version(workingversion[:default], moduledir)
-                expect(v).to eq(0)
-            end
-
-            it "#get_version -- should get the '#{workingversion[:default]}'" do
-                v = FalkorLib::Versioning.get_version(moduledir)
-                expect(v).to eq(workingversion[:default])
-            end
-
-            it "#major -- should collect the major version" do
-                v = FalkorLib::Versioning.get_version(moduledir)
-                m = FalkorLib::Versioning.major(v)
-                expect(m).to eq('4')
-            end
-            it "#minor -- should collect the minor version" do
-                v = FalkorLib::Versioning.get_version(moduledir)
-                m = FalkorLib::Versioning.minor(v)
-                expect(m).to eq('5')
-            end
-            it "#patch -- should collect the patch version" do
-                v = FalkorLib::Versioning.get_version(moduledir)
-                m = FalkorLib::Versioning.patch(v)
-                expect(m).to eq('6')
-            end
-
-            #FalkorLib.config[:versioning][:levels].reverse.each do |level|
-            ['patch', 'minor'].each do |level|
-                it "#set_version #bump -- #{level} bump version number from #{workingversion[:default]} to #{workingversion[level.to_sym]}" do
-                    v = FalkorLib::Versioning.get_version(moduledir)
-                    expect(v).to eq(workingversion[:default])
-                    v2 = FalkorLib::Versioning.bump(v, level.to_sym)
-                    expect(v2).to eq(workingversion[level.to_sym])
-                    #STDIN.should_receive(:gets).and_return('Yes')
-                    #d = FalkorLib::Versioning.set_version(v2, moduledir)
-                    #d.should == 0
-                    #v3 = FalkorLib::Versioning.get_version(moduledir)
-                    #v3.should == v2
-                end
-            end
-        end
-
-    #end #configatron.temp
+  #end #configatron.temp
 
 end # describe FalkorLib::Versioning

data/spec/falkorlib_spec.rb

@@ -5,4 +5,9 @@ describe FalkorLib do
         expect(FalkorLib.const_defined?(:VERSION)).to be true
     end
 
+    it "self.lib" do
+      expect(FalkorLib.lib).to include 'lib'
+    end
+
+
 end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
+# See https://github.com/colszowka/simplecov
+require 'simplecov'
+SimpleCov.start
+
+
 require 'rubygems'
 require 'bundler/setup'
 Bundler.setup
@@ -14,37 +19,73 @@ require 'falkorlib'
 require 'falkorlib/common'
 require 'falkorlib/git'
 
-def capture(stream)
-    begin
-        stream = stream.to_s
-        eval "$#{stream} = StringIO.new"
-        yield
-        result = eval("$#{stream}").string
-    ensure
-        eval("$#{stream} = #{stream.upcase}")
-    end
-    result
-end
 
-# Credits: [nu7hatch](https://gist.github.com/nu7hatch/631329)
-module Helpers
-  # Replace standard input with faked one StringIO.
-  def fake_stdin(*args)
+
+# Based on Thor
+RSpec.configure do |config|
+
+  def capture(stream)
     begin
-      $stdin = StringIO.new
-      $stdin.puts(args.shift) until args.empty?
-      $stdin.rewind
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
       yield
+      result = eval("$#{stream}").string
     ensure
-      $stdin = STDIN
+      eval("$#{stream} = #{stream.upcase}")
     end
+
+    result
   end
-end
 
-RSpec.configure do |conf|
-  conf.include(Helpers)
+  # # This code was adapted from Ruby on Rails, available under MIT-LICENSE
+  # # Copyright (c) 2004-2013 David Heinemeier Hansson
+  # def silence_warnings
+  #   old_verbose, $VERBOSE = $VERBOSE, nil
+  #   yield
+  # ensure
+  #   $VERBOSE = old_verbose
+  # end
+
+  # alias silence capture
 end
 
+
+# def capture(stream)
+#   begin
+#     stream = stream.to_s
+#     eval "$#{stream} = StringIO.new"
+#     yield
+#     result = eval("$#{stream}").string
+#   ensure
+#     eval("$#{stream} = #{stream.upcase}")
+#   end
+#   result
+# end
+
+# # Credits: [nu7hatch](https://gist.github.com/nu7hatch/631329)
+# module Helpers
+#   # Replace standard input with faked one StringIO.
+#   def fake_stdin(*args)
+#     begin
+#       $stdin = StringIO.new
+#       $stdin.puts(args.shift) until args.empty?
+#       $stdin.rewind
+#       yield
+#     ensure
+#       $stdin = STDIN
+#     end
+#   end
+# end
+
+
+# RSpec.configure do |conf|
+#   conf.include(Helpers)
+
+
+# end
+
+
+
 # require 'minitest/autorun'
 # require 'minitest/spec'
 
@@ -56,32 +97,32 @@ end
 # end
 
 # credits to [gabebw](http://gabebw.wordpress.com/2011/03/21/temp-files-in-rspec/)
-module UsesTempFiles
-  def self.included(example_group)
-    example_group.extend(self)
-  end
+# module UsesTempFiles
+#   def self.included(example_group)
+#     example_group.extend(self)
+#   end
 
-  def in_directory_with_file(file)
-    before do
-      @pwd = Dir.pwd
-      @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
-      FileUtils.mkdir_p(@tmp_dir)
-      Dir.chdir(@tmp_dir)
+#   def in_directory_with_file(file)
+#     before do
+#       @pwd = Dir.pwd
+#       @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
+#       FileUtils.mkdir_p(@tmp_dir)
+#       Dir.chdir(@tmp_dir)
 
-      FileUtils.mkdir_p(File.dirname(file))
-      FileUtils.touch(file)
-    end
+#       FileUtils.mkdir_p(File.dirname(file))
+#       FileUtils.touch(file)
+#     end
 
-    define_method(:content_for_file) do |content|
-      f = File.new(File.join(@tmp_dir, file), 'a+')
-      f.write(content)
-      f.flush # VERY IMPORTANT
-      f.close
-    end
+#     define_method(:content_for_file) do |content|
+#       f = File.new(File.join(@tmp_dir, file), 'a+')
+#       f.write(content)
+#       f.flush # VERY IMPORTANT
+#       f.close
+#     end
 
-    after do
-      Dir.chdir(@pwd)
-      FileUtils.rm_rf(@tmp_dir)
-    end
-  end
-end
+#     after do
+#       Dir.chdir(@pwd)
+#       FileUtils.rm_rf(@tmp_dir)
+#     end
+#   end
+# end