falkorlib 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98c462c237a49684f2aebb25a3ead3f6a83c1ed6
-  data.tar.gz: c8c24c9e37728bfdf99f1fbcb51f7d87ccbe7e64
+  metadata.gz: 9f187f26ec15f9da96207f2fb50947bf26ef74bf
+  data.tar.gz: dd8d820d7c2d5e5049a9a484c2c7c27beb8eab62
 SHA512:
-  metadata.gz: 36126336adf06eef2be266a4e07ef8fbe6a872a6bc90af032a4f17d90908a89ab75234288c9e78be45acf69e41b9b9df6b9f0e423824bed22198bc2c87e2c6b8
-  data.tar.gz: 91587779a881a63bb07e16c4c093de1ff6eb6b3f036d38e2eca0869f6b4e8b9ff89ea623cb1f2741535ef784706a88ffd7ad4f6a4b3c7b0d2c43f4c7be338039
+  metadata.gz: 812f7332aa6c7e44664f0dfe36c860f92d7f1fd33aa4c26fb87b96697bc45b553fae3d3e331deab657b1c771e2439614793dd416de758bd92a232cc1c8db07ef
+  data.tar.gz: 33618ec578e4dcf88fe9f61247c163b4622dd761e3c08155fb900a4cf659f360443b59cb01ecad0ee0c281512a8e92a1da5e7b845de9aa6f936119e03835a087

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.4.4)
+    falkorlib (0.4.5)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       deep_merge (~> 1.0.1)
       diffy (>= 3.0)
+      facter (~> 2.4.1)
       git_remote_branch (~> 0)
       json (~> 1.8)
       license-generator (~> 0)
@@ -19,6 +20,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
     addressable (2.3.6)
     artii (2.1.1)
     awesome_print (1.6.1)
@@ -33,6 +35,8 @@ GEM
     docile (1.1.5)
     ethon (0.7.0)
       ffi (>= 1.3.0)
+    facter (2.4.1)
+      CFPropertyList (~> 2.2.6)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
@@ -87,7 +91,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.3.3)
+    tins (1.3.5)
     travis (1.6.14)
       addressable (~> 2.3)
       backports

data/falkorlib.gemspec

@@ -135,8 +135,10 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency("deep_merge", '~> 1.0.1')
 	s.add_runtime_dependency("diffy", '>= 3.0')
 	s.add_runtime_dependency("logger", '>= 1.2.8')
-    s.add_runtime_dependency("thor",      '>= 0.19')
-    s.add_runtime_dependency("artii",     '>= 2.1')
+    s.add_runtime_dependency("thor",   '>= 0.19')
+    s.add_runtime_dependency("artii",  '>= 2.1')
+    s.add_runtime_dependency("facter", '~> 2.4.1')
+    
     #s.add_runtime_dependency("mercenary", '>= 0.3.5')
 
     #

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2015-03-09 17:07 svarrette>
+# Time-stamp: <Dim 2015-03-29 22:25 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -9,6 +9,7 @@ require "falkorlib"
 require "falkorlib/common"
 require 'erb'      # required for module generation
 require 'artii'
+require 'facter'
 
 include FalkorLib::Common
 
@@ -19,6 +20,12 @@ module FalkorLib  #:nodoc:
         module Bootstrap
             DEFAULTS =
               {
+               :motd    => {
+                            :title    => "Title",
+                            :support  => "#{ENV['GIT_AUTHOR_EMAIL']}",
+                            :width    => 80,
+                            :hostname => "`hostname -f`",
+                           },
                :metadata => {
                              :name         => '',
                              :type         => [],
@@ -26,7 +33,7 @@ module FalkorLib  #:nodoc:
                              :mail         => "#{ENV['GIT_AUTHOR_EMAIL']}",
                              :summary      => "rtfm",
                              :description  => '',
-                             :forge        => :gforge,
+                             :forge        => '',
                              :source       => '',
                              :project_page => '',
                              :license      => '',
@@ -330,6 +337,24 @@ module FalkorLib
         end # versionfile
 
 
+        ###### motd ######
+        # Generate a new motd (Message of the Day) file
+        # Supported options:
+        #  * :force [boolean] force action 
+        ##
+        def motd(dir = Dir.pwd, options = {})
+            config = FalkorLib::Config::Bootstrap::DEFAULTS[:motd].merge!(options)
+            path = normalized_path(dir)
+            erbfile = File.join( FalkorLib.templates, 'motd', 'motd.erb')
+            outfile = (options[:file] =~ /^\//) ? options[:file] : File.join(path, options[:file])
+            info "Generate a motd (Message of the Day) file '#{outfile}'"
+            config[:os] = Facter.value(:lsbdistdescription) if Facter.value(:lsbdistdescription)
+            config[:os] = "Mac " + Facter.value(:sp_os_version) if Facter.value(:sp_os_version)
+            write_from_erb_template(erbfile, outfile, config, options)
+        end # motd
+
+
+        
         ###### readme ######
         # Bootstrap a README file for various context
         # Supported options:
@@ -373,11 +398,13 @@ module FalkorLib
                                  forges[:url] + "/" + forges[:login] + "/" + config[:name].downcase
                              when :gitlab
                                  forges[:url] + "/" + forges[:name].downcase
+                             else
+                                 ""
                              end
-
+            ap config
             FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].each do |k,v|
                 next if v.kind_of?(Array) or [ :license, :forge ].include?( k )
-                next if k == :name and ! name.empty?
+                next if k == :name and ! config[:name].empty?
                 next if k == :issues_url and ! [ :github, :gitlab ].include?( config[:forge] )
                 #next unless [ :name, :summary, :description ].include?(k.to_sym)
                 default_answer = case k

data/lib/falkorlib/cli/new.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2015-03-09 12:09 svarrette>
+# Time-stamp: <Dim 2015-03-29 17:52 svarrette>
 ################################################################################
 
 require 'thor'
@@ -102,6 +102,20 @@ RVM_LONG_DESC
                 FalkorLib::Bootstrap.versionfile(path, options)
             end # versionfile
 
+            ###### motd ######
+            method_option :file,     :aliases => '-f', :default => '/etc/motd', :desc => "File storing the message of the day"
+            method_option :width,    :aliases => '-w', :default => 80, :type => :numeric, :desc => "Width for the text"
+            method_option :title,    :aliases => '-t', :default => "Title", :desc => "Title to place in the motd"
+            method_option :subtitle, :desc => "Eventual subtitle to place below the title"
+            method_option :hostname, :aliases => '-h', :default => `hostname -f`, :desc => "Hostname"
+            method_option :support,  :aliases => '-s', :default => "#{ENV['GIT_AUTHOR_EMAIL']}", :desc => "Support/Contact mail"
+            method_option :desc,     :aliases => '-d', :desc => "Short Description of the host"
+            method_option :nodemodel,:aliases => '-n', :desc => "Node Model"
+            #......................................
+            desc "motd PATH [options]", "Initiate a 'motd' file - message of the day"
+            def motd(path = '.')
+                FalkorLib::Bootstrap.motd(path, options)
+            end # motd
 
             ###### readme ######
             method_option :make, :default => true,

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2015-03-09 17:02 svarrette>
+# Time-stamp: <Dim 2015-03-29 18:47 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -9,6 +9,7 @@ require 'erb'      # required for module generation
 require 'diffy'
 require 'json'
 require "pathname"
+require "facter"
 
 module FalkorLib #:nodoc:
 

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

data/spec/falkorlib/bootstrap_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # bootstrap_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Lun 2015-03-09 17:09 svarrette>
+# Time-stamp: <Dim 2015-03-29 22:28 svarrette>
 #
 # @description Check the Bootstrapping operations
 #
@@ -150,6 +150,7 @@ describe FalkorLib::Bootstrap do
                 t.should be_true
                 FalkorLib.config[:no_interaction] = false
             end
+
         end # context
 
     end # each
@@ -157,14 +158,22 @@ describe FalkorLib::Bootstrap do
     ############################################
     context 'boostrap repo' do
         dir = dirs[:default]
-        
         it '#repo' do
             FalkorLib.config[:no_interaction] = true
             FalkorLib::Bootstrap.repo(dir, { :no_interaction => true, :git_flow => false })
             FalkorLib.config[:no_interaction] = false
         end
-
     end
 
+    ############################################
+    context 'boostrap motd' do
+        dir = dirs[:default]
+        it "#motd" do
+            motdfile = File.join(dir, 'motd1')
+            FalkorLib::Bootstrap.motd(dir, { :file => "#{motdfile}", :no_interaction => true })
+            t = File.exists?(motdfile)
+            t.should be_true
+        end
+    end 
     
 end

data/templates/README/header_readme.erb

@@ -4,7 +4,7 @@
 [![Licence](<%= FalkorLib::Bootstrap::get_badge("license", config[:license], 'blue') %>)](<%= FalkorLib::Config::Bootstrap::DEFAULTS[:licenses][ config[:license] ][:url] %>)
 <% end %>
 
-       Time-stamp: <Mar 2015-02-24 21:23 svarrette>
+       Time-stamp: <Dim 2015-03-29 14:28 svarrette>
 
        <%= ::Artii::Base.new().asciify( config[:name] ).split("\n").join("\n       ") %>
        Copyright (c) <%= Time.now.year %> <%= config[:author] %> <<%= config[:mail] %>>
@@ -20,6 +20,7 @@
 
 <%= config[:description] %>
 
+
 ## Installation 
 
 This repository is hosted on [<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:name] %>](<%= config[:project_page] %>). 

data/templates/README/readme_gitflow.erb

@@ -12,7 +12,7 @@ Thus you are more than encouraged to install the [git-flow](https://github.com/n
 
 ### Releasing mechanism
 
-The operation consisting of releasing a new version of this repository is automated by a set of tasks within the root `<%= config[:rake] ? 'R' : 'M' %>akefile`.
+The operation consisting of releasing a new version of this repository is automated by a set of tasks within the root `<%= options[:rake] ? 'R' : 'M' %>akefile`.
 
 In this context, a version number have the following format:
 
@@ -31,16 +31,16 @@ The current version number is stored in the root file `VERSION`. __/!\ NEVER MAK
 
 For more information on the version, run:
 
-     $> <%= config[:make] ? 'make versioninfo' : 'rake version:info' %>
+     $> <%= options[:make] ? 'make versioninfo' : 'rake version:info' %>
 
 If a new version number such be bumped, you simply have to run:
 
-      $> <%= config[:make] ? 'make start_bump_{major,minor,patch}' : 'rake version:{major,minor,patch}' %>
+      $> <%= options[:make] ? 'make start_bump_{major,minor,patch}' : 'rake version:{major,minor,patch}' %>
 
 This will start the release process for you using `git-flow`.
 Once you have finished to commit your last changes, make the release effective by running:
 
-      $> <%= config[:make] ? 'make release' : 'rake version:release' %>
+      $> <%= options[:make] ? 'make release' : 'rake version:release' %>
 
 it will finish the release using `git-flow`, create the appropriate tag in the `<%=  FalkorLib::GitFlow.branches(:master) %>` branch and merge all things the way they should be.
 

data/templates/motd/motd.erb

@@ -0,0 +1,17 @@
+<%= ("=" * config[:width]) + "\n" %>
+Welcome to <%= config[:hostname].chomp %>
+<%= ("=" * config[:width]) + "\n" %>
+    <%= ::Artii::Base.new().asciify( config[:title] ).split("\n").join("\n    ") %>
+<% if config[:subtitle] %>
+    <%= ::Artii::Base.new().asciify( config[:subtitle] ).split("\n").join("\n    ") %>
+<% end %>
+<%= ("=" * config[:width]) + "\n" %>
+  Hostname: <%= config[:hostname].chomp %>
+  OS:       <%= config[:os] %>
+  Support:  <%= config[:support] %>
+
+ === <%= config[:desc] %> ===
+ <%= config[:nodemodel] %> (<%= Facter.value(:physicalprocessorcount) %> <%= Facter.value(:processor0) %>)
+ RAM: <%= Facter.value(:memorysize) %> -- Swap size: <%= Facter.value(:swapsize) %>
+
+<%= ("=" * config[:width]) + "\n" %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +414,7 @@ files:
 - templates/Rakefile/footer_rakefile.erb
 - templates/Rakefile/header_rakefile.erb
 - templates/Rakefile/rakefile_gitflow.erb
+- templates/motd/motd.erb
 - templates/puppet/modules/.gitignore
 - templates/puppet/modules/.vagrant_init.rb
 - templates/puppet/modules/Gemfile