lambom 0.4.3 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 18348d90022514710524de670d3a08e14a50c34d
+  data.tar.gz: 1b06f188691179fd7fafa04aa636d451c7282e02
+SHA512:
+  metadata.gz: 058f35736be038c22002cb8f74f11d15db05accdf9380a6381ea7782b0d3c038962cb777fa298d76c25752c6faff655389ef644acaff87f9f24b11ea87be052a
+  data.tar.gz: ea449373e8f86512ff94165d710fb999715da0a7b030c6d7ffc85a09c5eef1b55a82bec85411c8bc1153788ec51827b58ef9d4fead4a178b220f687d82ec29d0

data/bin/lambom

@@ -24,10 +24,10 @@ OptionParser.new do |opts|
         options[:json_file] = j
     end
 
-    opts.on("-b", "--berksfile [BERKSFILE FILE]",
-           "Use specified berksfile to download cookbooks and dependencies") do |j|
-        options[:berksfile] = b
-    end
+    # opts.on("-b", "--berksfile [BERKSFILE FILE]",
+    #        "Use specified berksfile to download cookbooks and dependencies") do |j|
+    #     options[:berksfile] = b
+    # end
 
     opts.on("-c", "--cached",
            "Use local cached cookbooks") do
@@ -74,10 +74,21 @@ end.parse!
 
 out = ''
 begin
+
     out = Lambom.run(options)
-rescue Exception => e
+
+rescue StandardError => e
+
     puts "Error: #{e.message}"
     exit 1
+
+rescue SystemExit => s
+    
+    unless s.success?
+        puts "Error executing convergence: #{out}"
+        exit s.status
+    end
+
 end
 
 puts "Command executed successfully"

data/lambom.gemspec

@@ -21,11 +21,13 @@ EOF
   s.files         = `git ls-files`.split($/)
   s.license       = 'Apache-2.0'
 
-  s.add_runtime_dependency "oj","~> 2.5.4"
-  s.add_runtime_dependency "mixlib-authentication","~> 1.3.0"
-  s.add_runtime_dependency "mixlib-shellout","~> 1.3.0"
-  s.add_runtime_dependency "chef","~> 11.8.2"
-  s.add_runtime_dependency "berkshelf","~> 2.0.12"
+  s.add_runtime_dependency "oj","~> 2.5"
+  #s.add_runtime_dependency "mixlib-authentication","~> 1.3"
+  #s.add_runtime_dependency "mixlib-shellout","~> 1.3"
+  #s.add_runtime_dependency "chef","~> 11.8"
+  s.add_runtime_dependency "chef", "~> 12.0.3"
+
+  # s.add_runtime_dependency "berkshelf","~> 2.0.12"
 
   s.add_development_dependency "rspec", "~> 2.0"
 

data/lib/lambom.rb

@@ -22,11 +22,8 @@ module Lambom
             raise 'Must be run as root' unless Process.uid == 0
 
             #cargar config
-            conf = Lambom::Config.new.load
+            conf = Lambom::Config.new.load(argv)
             
-            # sobreescribimos a configuracion ca linea de comandos
-            conf.merge(argv)
-
             # executar converxencia
             Lambom::Converger.new(conf).run
         end

data/lib/lambom/config.rb

@@ -1,105 +1,121 @@
 require 'yaml'
 
 module Lambom
-    class Config
-        CONFIG_DIR = "/etc/riyic"
-        FILE = "#{CONFIG_DIR}/lambom.conf"
-        UNIX_PATH_REGEX = /^[\w\s.\/\-_+%]+$/i
-        URL_REGEX = /^(http(s)?|ftp):\/\/(([A-Za-z0-9-]+\.)*([A-Za-z0-9-]+\.[A-Za-z0-9]+))+((\/?)(([A-Za-z0-9\._\-]+)(\/){0,1}[A-Za-z0-9.-\/]*)){0,1}/
-
-        attr_accessor :server, 
-                        :private_key_file, 
-                        :environment, 
-                        :loglevel, 
-                        :json_file, 
-                        :berksfile, 
-                        :cached, 
-                        :download_tarball,
-                        :api_url
-                        
-        attr_reader :logdir, :logfile
-
-        def initialize
-            @server = nil
-            @private_key_file = nil
-            @json_file = nil
-            @berksfile = nil
-            @cached = false
-            @environment = 'production'
-            @loglevel = 'debug'
-            @logdir = '/var/log/riyic'
-            @logfile = "solo_#{Time.now.strftime("%F_%T")}"
-            @download_tarball = nil
-            @api_url = nil
-        end
 
-        def load
-            # evitamos cascar si o ficheiro de configuracion non existe
-            return self unless File.exists?(FILE)
-
-            h = {}
-            begin
-                h = YAML.load(IO::read(FILE))
-            rescue Exception => e
-                e.to_s =~ /line (\d+) column/
-                raise "Error loading yaml config file #{FILE}, syntax error in line #{$1}"
-            end
-
-            puts "hash de opcions: #{h.inspect}" if $debug
-
-            # evitamos cargar as opcions si non e un hash
-            if h.class == Hash 
-                h.each do |k,v|
-                    if validate(k,v)
-                        instance_variable_set "@#{k}".to_sym, v
-                    else
-                        raise "Invalid value '#{v}' to parameter '#{k}'"
-                    end
-                end
-            end
+  class Config
+
+    CONFIG_DIR = "/etc/riyic"
+    FILE = "#{CONFIG_DIR}/lambom.conf"
+    UNIX_PATH_REGEX = /^[\w\s.\/\-_+%]+$/i
+    URL_REGEX = /^(http(s)?|ftp):\/\/(([A-Za-z0-9-]+\.)*([A-Za-z0-9-]+\.[A-Za-z0-9]+))+((\/?)(([A-Za-z0-9\._\-]+)(\/){0,1}[A-Za-z0-9.-\/]*)){0,1}/
+
+    attr_accessor(
+      :server, 
+      :private_key_file, 
+      :environment, 
+      :loglevel, 
+      :json_file, 
+      :berksfile, 
+      :cached, 
+      :download_tarball,
+      :api_url
+    )
             
-            self
+    attr_reader :logdir, :logfile
 
-        end
+  
+    def initialize
+      @server = nil
+      @private_key_file = nil
+      @json_file = nil
+      @berksfile = nil
+      @cached = false
+      @environment = 'production'
+      @loglevel = 'debug'
+      @logdir = '/var/log/riyic'
+      @logfile = "solo_#{Time.now.strftime("%Y%m%d%H%M%S")}"
+      @download_tarball = nil
+      @api_url = nil
+    end
 
-        def merge(options)
-            options.each do |k,v|
-                puts "mergeando #{k} con valor #{v} en config" if $debug
-                self.send("#{k}=",v) if validate(k,v)
-                #instance_variable_set "@#{k}".to_sym, v if validate(k,v)
-            end
+
+    def load(argv={})
+
+      h = {}
+
+      # evitamos cascar si o ficheiro de configuracion non existe
+      if File.exists?(FILE)
+
+        begin
+          h = YAML.load(IO::read(FILE))
+        rescue Exception => e
+          e.to_s =~ /line (\d+) column/
+          raise "Error loading yaml config file #{FILE}, syntax error in line #{$1}"
         end
 
-        def validate(parametro,valor)
-
-            case parametro.to_sym
-            when :server
-                # uuid
-                valor =~ /^[\d\w\-]{36}$/
-            when :private_key_file
-                #unix path
-                valor =~ UNIX_PATH_REGEX && File.exists?(valor)
-            when :environment
-                #env de rails
-                ["production","development","test"].include?(valor)
-            when :loglevel
-                #loglevel de chef
-                %w{debug info}.include?(valor)
-            when :berksfile
-                valor =~ UNIX_PATH_REGEX && File.exists?(valor)
-            when :json_file
-                valor =~ UNIX_PATH_REGEX && File.exists?(valor)
-            when :cached
-                [true,false].include?(valor)
-            when :api_url
-                valor =~ URL_REGEX
-            when :download_tarball
-                valor =~ URL_REGEX
-            else
-                false
-                #raise "Invalid parameter #{parametro}"
-            end
+        puts "hash de opcions: #{h.inspect}" if $debug
+
+        raise "Error in config file, YAML loaded is not a hash" unless h.class == Hash
 
+        # convert keys from string to symbols
+        h = h.each_with_object({}) {|(k,v),o| o[k.to_sym] = v}
+      
+      end
+
+      # merge line command hash with config file loaded
+      h.merge!(argv)
+  
+      # validate parametros
+      h.each do |k,v|
+        if validate(k,v)
+          instance_variable_set "@#{k}".to_sym, v
+        else
+          raise "Invalid value '#{v}' to parameter '#{k}'"
         end
+      end
+      
+      return self
+
+    end
+
+    def merge(options={})
+      options.each do |k,v|
+        puts "mergeando #{k} con valor #{v} en config" if $debug
+        self.send("#{k}=",v) if validate(k,v)
+      end
+    end
+
+
+    def validate(parametro,valor)
+
+      case parametro.to_sym
+      when :server
+        # uuid
+        valor =~ /^[\d\w\-]{36}$/
+      when :private_key_file
+        #unix path
+        valor =~ UNIX_PATH_REGEX && File.exists?(valor)
+      when :environment
+        #env de rails
+        ["production","development","test"].include?(valor)
+      when :loglevel
+        #loglevel de chef
+        %w{debug info}.include?(valor)
+      when :berksfile
+        valor =~ UNIX_PATH_REGEX && File.exists?(valor)
+      when :json_file
+        valor =~ UNIX_PATH_REGEX && File.exists?(valor)
+      when :cached
+        [true,false].include?(valor)
+      when :api_url
+        valor =~ URL_REGEX
+      when :download_tarball
+        valor =~ URL_REGEX
+      else
+        false
+        #raise "Invalid parameter #{parametro}"
+      end
+
     end
+  end
 end

data/lib/lambom/converger.rb

@@ -1,4 +1,5 @@
 #require "berkshelf/cli"
+require 'chef/application/solo'
 module Lambom
     class Converger
         include ShellMixin
@@ -22,7 +23,7 @@ module Lambom
         CHEF_CONF_FILE = "#{Lambom::Config::CONFIG_DIR}/solo.rb"
  
         CHEF_CONF_DEV = <<EOF
-cookbook_path ["/mnt/opscode/cookbooks", "/mnt/others/cookbooks", "/mnt/riyic/cookbooks"]
+cookbook_path ["/mnt/cookbooks/supermarket", "/mnt/others/cookbooks", "/mnt/riyic/cookbooks"]
 file_cache_path "#{CACHE_PATH}"
 EOF
 
@@ -72,45 +73,64 @@ EOF
         end
 
         def descargar_cookbooks
+            
             if conf.download_tarball
+            
                 # download cookbooks from a tarball
                 temp = "/tmp/cookbooks.tar.gz"
                 run_cmd('curl','-o',temp, '-L',conf.download_tarball)
                 FileUtils.mkdir_p(DEFAULT_CHEF_PATH) unless File.directory?(DEFAULT_CHEF_PATH)
                 run_cmd('tar','xzf',temp,'--no-same-owner','-C', DEFAULT_CHEF_PATH)
                 File.unlink(temp)
-            else
-                # use berkshelf to download cookbooks
-                # Download berksfile from riyic unless it was passed by command line
-                descargar_berksfile unless @berksfile
-                berks_install
+                
             end
+            
+            # else
+            #     # use berkshelf to download cookbooks
+            #     # Download berksfile from riyic unless it was passed by command line
+            #     descargar_berksfile unless @berksfile
+            #     berks_install
+            # end
         end
 
-        def descargar_berksfile
-            @berksfile = "#{CACHE_PATH}/#{@name}.berksfile"
-            berksfile_str = Lambom::ApiClient.new(conf).get_berksfile
+        # def descargar_berksfile
+        #     @berksfile = "#{CACHE_PATH}/#{@name}.berksfile"
+        #     berksfile_str = Lambom::ApiClient.new(conf).get_berksfile
 
-            file = File.new(@berksfile,"w")
-            file.write(berksfile_str)
-            file.close
-        end
+        #     file = File.new(@berksfile,"w")
+        #     file.write(berksfile_str)
+        #     file.close
+        # end
 
 
-        def berks_install
-            cmd = %W{
-                berks install -b #{@berksfile} -p #{DEFAULT_CHEF_PATH}/cookbooks
-            }
+        # def berks_install
+        #     cmd = %W{
+        #         berks install -b #{@berksfile} -p #{DEFAULT_CHEF_PATH}/cookbooks
+        #     }
 
-            run_cmd *cmd       
+        #     run_cmd *cmd       
 
-        end
+        # end
 
 
         def ejecutar_converger
 
+            #cmd = %W{
+            #   chef-solo
+            #   -c #{CHEF_CONF_FILE}
+            #   --log_level #{conf.loglevel}
+            #   -j #{@json_file}
+            #}
+            #
+            #unless $debug
+            #    cmd += [
+            #        "--logfile", 
+            #        "#{conf.logdir}/#{conf.logfile}"
+            #    ]
+            #end
+            #run_cmd *cmd
+            
             cmd = %W{
-               chef-solo
                -c #{CHEF_CONF_FILE}
                --log_level #{conf.loglevel}
                -j #{@json_file}
@@ -122,11 +142,17 @@ EOF
                     "#{conf.logdir}/#{conf.logfile}"
                 ]
             end
-            
-            run_cmd *cmd
 
+            # reseteamos argv
+            ARGV.clear
+            cmd.each do |arg|
+                ARGV << arg
+            end
+
+            Chef::Application::Solo.new.run
         end
 
+
         def preparar_entorno
             # dont drop ruby vars from env
             #ENV_VARS_DELETE.each {|v| ENV.delete(v)}

data/lib/lambom/version.rb

@@ -1,3 +1,3 @@
 module Lambom
-    VERSION = "0.4.3"
+    VERSION = "0.4.7"
 end

data/spec/api_client_spec.rb

@@ -2,27 +2,27 @@ require "lambom"
 require "lambom/api"
 
 describe Lambom::ApiClient do
-    conf = Lambom::Config.new.load
-    
-    conf.merge(environment: "production",
-              server: "4586273f-f17a-4984-99ef-69c255e1b395",
-              private_key_file: "spec/private_key.pem",
-              api_url: "http://172.17.42.1:3000/api/v1")
+  conf = Lambom::Config.new.load(
+    environment: "production",
+    server: "4586273f-f17a-4984-99ef-69c255e1b395",
+    private_key_file: "spec/private_key.pem",
+    api_url: "http://172.17.42.1:3000/api/v1"
+  )
 
-    api = Lambom::ApiClient.new(conf)
+  api = Lambom::ApiClient.new(conf)
 
-    it "must be an ApiClient object" do
-        expect(api).to be_an_instance_of(Lambom::ApiClient)
-    end
+  it "must be an ApiClient object" do
+    expect(api).to be_an_instance_of(Lambom::ApiClient)
+  end
 
-    describe "getAttributes" do
-        it "must connect to riyic api" do
-            expect(api.get_server_config).to match(/^\{.+\}$/)
-        end
-        it "must fail to connect to api" do
-            conf.merge(server: "61a75d44-9856-4e64-a269-111111111111")
-            api2 = Lambom::ApiClient.new(conf)
-            expect{api2.get_server_config}.to raise_error(/api error/)
-        end
+  describe "getAttributes" do
+    it "must connect to riyic api" do
+      expect(api.get_server_config).to match(/^\{.+\}$/)
+    end
+    it "must fail to connect to api" do
+      conf.merge(server: "61a75d44-9856-4e64-a269-111111111111")
+      api2 = Lambom::ApiClient.new(conf)
+      expect{api2.get_server_config}.to raise_error(/api error/)
     end
+  end
 end

data/spec/converger_spec.rb

@@ -4,12 +4,15 @@ require "lambom/converger"
 describe Lambom::Converger do
     conf = Lambom::Config.new
 
-    conf.merge(:environment => "production",
-              :server => "4586273f-f17a-4984-99ef-69c255e1b395",
-              :private_key_file => "spec/private_key.pem",
-              :loglevel => 'info',
-              :json_file => 'spec/test_json_file',
-              :api_url => 'http://172.17.42.1:3000/api/v1' )
+    conf.merge(
+        :environment => "production",
+        :server => "4586273f-f17a-4984-99ef-69c255e1b395",
+        :private_key_file => "spec/private_key.pem",
+        :loglevel => 'info',
+        :json_file => 'spec/test_json_file',
+        :api_url => 'http://172.17.42.1:3000/api/v1',
+        :download_tarball => 'https://s3-eu-west-1.amazonaws.com/riyic/cookbooks.tar.gz'
+    )
 
 
     it "must run convergence tool" do

data/spec/test_json_file

@@ -1,10 +1,9 @@
 {
   "riyic": {
-    "dockerized": "no",
     "updates_check_interval": "never",
     "env": "development"
   },
   "run_list": [
     "recipe[riyic::default]"
   ]
-}
+}

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambom
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - J. Gomez
@@ -14,100 +13,46 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
-- !ruby/object:Gem::Dependency
-  name: mixlib-authentication
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 11.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 11.8.2
-- !ruby/object:Gem::Dependency
-  name: berkshelf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 12.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 12.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: ! "Riyic is a server configuration service based on chef (http://riyic.com).\nThe
+description: "Riyic is a server configuration service based on chef (http://riyic.com).\nThe
   lambom gem is a tool to apply chef configurations generated with the riyic service,
   or defined in a pair of plain text files \n(a json attributes file where the server
   configuration is detailed and a berkshelf file which specifies cookbooks restrictions
@@ -118,8 +63,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - README.md
 - bin/lambom
 - lambom.gemspec
@@ -144,26 +89,25 @@ files:
 homepage: https://github.com/RIYIC/lambom
 licenses:
 - Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tool to configure servers based on chef-solo and berkshelf
 test_files: []