lambom 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18348d90022514710524de670d3a08e14a50c34d
-  data.tar.gz: 1b06f188691179fd7fafa04aa636d451c7282e02
+  metadata.gz: 3d9ff2b563d32551701e588d0d320133b8d6ed33
+  data.tar.gz: db0627c24f2704f595bcfb04bd5606487e7750eb
 SHA512:
-  metadata.gz: 058f35736be038c22002cb8f74f11d15db05accdf9380a6381ea7782b0d3c038962cb777fa298d76c25752c6faff655389ef644acaff87f9f24b11ea87be052a
-  data.tar.gz: ea449373e8f86512ff94165d710fb999715da0a7b030c6d7ffc85a09c5eef1b55a82bec85411c8bc1153788ec51827b58ef9d4fead4a178b220f687d82ec29d0
+  metadata.gz: 934d87813db8c8f5057f7be31aad736e34427968ed3691aef7fb0c146266f5d4ea1fcade327312551f973550e4ffb9d3c0b1b2f536338dd95790ce79a80b88ee
+  data.tar.gz: 953c4955a06a55ad280793216ddfab86ad65514e02296e89aadc29c62a441962f6f13262fca69361885203f80b0a55e9448d25fc9b51f064e3c81c17cb7fffbe

data/lambom.gemspec

@@ -6,7 +6,7 @@ require "lambom/version"
 Gem::Specification.new do |s|
   s.name        = 'lambom'
   s.version     = Lambom::VERSION
-  s.date        = '2014-01-21'
+  s.date        = Date.today.to_s
   s.summary     = "Tool to configure servers based on chef-solo and berkshelf"
   s.description = <<-EOF
 Riyic is a server configuration service based on chef (http://riyic.com).

data/lib/lambom/api.rb

@@ -6,114 +6,114 @@ require 'openssl'
 require 'net/http'
 
 module Lambom
-    class ApiClient
-        DEFAULT_API_URL =  "https://riyic.com/api/v1"
-
-        def initialize(conf)
-            @server_id = conf.server or raise "Required parameter \"server\" not found"
-            @private_key_file = conf.private_key_file or raise "Required parameter \"private_key_file\" not found"
-            @env = conf.environment
-
-            @api_url = conf.api_url || DEFAULT_API_URL
-        end
-
-        def get_server_config
-            get('servers',"#{@server_id}/generate_config");
-
-        end
-
-        def get_berksfile
-            get("servers","#{@server_id}/berksfile")
-        end
-
-
-
-        def get(controller, action='',params={})
-            uri = build_uri(controller,action)
-            req = Net::HTTP::Get.new(uri.request_uri)
-            req.body=generate_body_string(params)
-            send(uri,req)
-
-        end
-
-        def post(controller, action='',params={})
-            uri = build_uri(controller,action)
-            req = Net::HTTP::Post.new(uri.request_uri)
-            #req.set_form_data(params)
-            req.body=generate_body_string(params)
-            send(uri,req)
-        end
-
-        def send(uri,req)
-            
-            ## agregamos os headers da signature
-            headers = generate_headers(@server_id, @private_key_file, req)
-            puts headers.inspect if $debug
-            
-            headers.each do |header,value|
-                req[header] = value
-            end
-            
-            http = Net::HTTP.new(uri.host, uri.port)
-            http.use_ssl = true if uri.scheme == 'https'
-
-            response = http.request(req)
-            puts response.body if $debug
-
-            if response.is_a?(Net::HTTPSuccess)
-                return response.body
-            else
-                puts "code:#{response.code}, message:#{response.message}" if $debug
-                raise "api error: #{response.body}"
-            end
-
-            #puts resp.inspect if @debug
-            #response = Oj.load(response.body)
-
-            #if response["status"] == "OK" 
-            #    return response
-            #else
-            #    raise response.body
-            #end
-                
-        end
-
-
-        private
-
-        def build_uri(controller, action='')
-            URI("#{@api_url}/#{controller}/#{action}")
-        end
-
-        def generate_body_string(h={})
-            r = ""
-
-            h.each do |k,v|
-                r << "&#{k}=#{v}"
-            end
-
-            r
-        end
-
-
-        def generate_headers(server_id, private_key_file, request)
-            
-            args = {
-              :body => request.body.to_s,
-              :user_id => server_id.to_s,
-              :http_method => request.method.to_s,
-              :timestamp => Time.now.iso8601,
-              :path => request.path.to_s,
-              :proto_version => 1.1
-            }
-            
-            # cargamos a private key do ficheiro
-            key = IO::read(private_key_file)
-            private_key = OpenSSL::PKey::RSA.new(key)
-            
-            Mixlib::Authentication::SignedHeaderAuth.signing_object(args).sign(private_key)
-        end
+  class ApiClient
+    DEFAULT_API_URL =  "https://riyic.com/api/v1"
 
+    def initialize(conf)
+      @server_id = conf.server or raise "Required parameter \"server\" not found"
+      @private_key_file = conf.private_key_file or raise "Required parameter \"private_key_file\" not found"
+      @env = conf.environment
 
+      @api_url = conf.api_url || DEFAULT_API_URL
     end
+
+    def get_server_config
+      get('servers',"#{@server_id}/generate_config");
+
+    end
+
+    def get_berksfile
+      get("servers","#{@server_id}/berksfile")
+    end
+
+
+
+    def get(controller, action='',params={})
+      uri = build_uri(controller,action)
+      req = Net::HTTP::Get.new(uri.request_uri)
+      req.body=generate_body_string(params)
+      send(uri,req)
+
+    end
+
+    def post(controller, action='',params={})
+      uri = build_uri(controller,action)
+      req = Net::HTTP::Post.new(uri.request_uri)
+      #req.set_form_data(params)
+      req.body=generate_body_string(params)
+      send(uri,req)
+    end
+
+    def send(uri,req)
+      
+      ## agregamos os headers da signature
+      headers = generate_headers(@server_id, @private_key_file, req)
+      puts headers.inspect if $debug
+      
+      headers.each do |header,value|
+        req[header] = value
+      end
+      
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
+
+      response = http.request(req)
+      puts response.body if $debug
+
+      if response.is_a?(Net::HTTPSuccess)
+        return response.body
+      else
+        puts "code:#{response.code}, message:#{response.message}" if $debug
+        raise "api error: #{response.body}"
+      end
+
+      #puts resp.inspect if @debug
+      #response = Oj.load(response.body)
+
+      #if response["status"] == "OK" 
+      #  return response
+      #else
+      #  raise response.body
+      #end
+        
+    end
+
+
+    private
+
+    def build_uri(controller, action='')
+      URI("#{@api_url}/#{controller}/#{action}")
+    end
+
+    def generate_body_string(h={})
+      r = ""
+
+      h.each do |k,v|
+        r << "&#{k}=#{v}"
+      end
+
+      r
+    end
+
+
+    def generate_headers(server_id, private_key_file, request)
+      
+      args = {
+        :body => request.body.to_s,
+        :user_id => server_id.to_s,
+        :http_method => request.method.to_s,
+        :timestamp => Time.now.iso8601,
+        :path => request.path.to_s,
+        :proto_version => 1.1
+      }
+      
+      # cargamos a private key do ficheiro
+      key = IO::read(private_key_file)
+      private_key = OpenSSL::PKey::RSA.new(key)
+      
+      Mixlib::Authentication::SignedHeaderAuth.signing_object(args).sign(private_key)
+    end
+
+
+  end
 end

data/lib/lambom/converger.rb

@@ -1,190 +1,190 @@
 #require "berkshelf/cli"
 require 'chef/application/solo'
 module Lambom
-    class Converger
-        include ShellMixin
-        
-        DEFAULT_CHEF_PATH = '/var/chef'
-        
-        CACHE_PATH = "#{DEFAULT_CHEF_PATH}/cache"
-        
-        ENV_VARS_DELETE = %w{
-                         GEM_PATH 
-                         RUBY_VERSION 
-                         GEM_HOME 
-                         MY_RUBY_HOME
-                         rvm_bin_path
-                         rvm_path
-                         rvm_gem_options
-                         rvm_prefix
-                         rvm_version
-        }
-
-        CHEF_CONF_FILE = "#{Lambom::Config::CONFIG_DIR}/solo.rb"
+  class Converger
+    include ShellMixin
+    
+    DEFAULT_CHEF_PATH = '/var/chef'
+    
+    CACHE_PATH = "#{DEFAULT_CHEF_PATH}/cache"
+    
+    ENV_VARS_DELETE = %w{
+             GEM_PATH 
+             RUBY_VERSION 
+             GEM_HOME 
+             MY_RUBY_HOME
+             rvm_bin_path
+             rvm_path
+             rvm_gem_options
+             rvm_prefix
+             rvm_version
+    }
+
+    CHEF_CONF_FILE = "#{Lambom::Config::CONFIG_DIR}/solo.rb"
  
-        CHEF_CONF_DEV = <<EOF
+    CHEF_CONF_DEV = <<EOF
 cookbook_path ["/mnt/cookbooks/supermarket", "/mnt/others/cookbooks", "/mnt/riyic/cookbooks"]
 file_cache_path "#{CACHE_PATH}"
 EOF
 
-        CHEF_CONF_OTHER = <<EOF
+    CHEF_CONF_OTHER = <<EOF
 cookbook_path ["#{DEFAULT_CHEF_PATH}/cookbooks", "#{DEFAULT_CHEF_PATH}/site-cookbooks"]
 file_cache_path "#{CACHE_PATH}"
 EOF
-        CHEF_CONF = {
-            :development => CHEF_CONF_DEV,
-            :other => CHEF_CONF_OTHER,
-        }
-
-        def initialize(conf)
-            @conf = conf
-            @name = conf.server || String.random(8)
-            @json_file = conf.json_file
-            @berksfile = conf.berksfile
-        end
-
-
-        attr_reader :conf,:attributes_json
-
-        def run
-            preparar_entorno
-
-            descargar_atributos unless conf.json_file
-
-            descargar_cookbooks unless conf.cached || conf.environment == 'development'
-
-            ejecutar_converger
-        end
-
-
-        private
-
-        def descargar_atributos
-            
-            # descargar atributos do servidor 
-            json_attributes = Lambom::ApiClient.new(conf).get_server_config
-
-            @json_file = "#{CACHE_PATH}/#{@name}.json"
-
-            file = File.new(@json_file,"w")
-            file.write(json_attributes)
-            file.close
-
-        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)
-                
-            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
-
-        #     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
-        #     }
-
-        #     run_cmd *cmd       
-
-        # 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{
-               -c #{CHEF_CONF_FILE}
-               --log_level #{conf.loglevel}
-               -j #{@json_file}
-            }
-            
-            unless $debug
-                cmd += [
-                    "--logfile", 
-                    "#{conf.logdir}/#{conf.logfile}"
-                ]
-            end
-
-            # 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)}
-            #ENV["PATH"] = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-            
-            #creamos directorio de logs
-            FileUtils.mkdir_p(conf.logdir) unless File.directory?(conf.logdir)
-            File.chmod(0750, conf.logdir)
-
-            #creamos o directorio cache de chef
-            FileUtils.mkdir_p(CACHE_PATH) unless File.directory?(CACHE_PATH)
-            File.chmod(0750,CACHE_PATH)
-
-            # establecemos o archivo de configuracion de chef segun o entorno
-            switch_chef_conf(conf.environment.to_sym)
-        end
-
-
-        def switch_chef_conf(env)
-            FileUtils.mkdir_p(Lambom::Config::CONFIG_DIR) unless File.directory?(Lambom::Config::CONFIG_DIR)
-            File.chmod(0750,Lambom::Config::CONFIG_DIR)
-
-            file = File.new(CHEF_CONF_FILE,"w")
-
-            if CHEF_CONF.has_key?(env)
-                file.write(CHEF_CONF[env])
-            else
-                file.write(CHEF_CONF[:other])
-            end
-
-
-            file.close
-        end
+    CHEF_CONF = {
+      :development => CHEF_CONF_DEV,
+      :other => CHEF_CONF_OTHER,
+    }
+
+    def initialize(conf)
+      @conf = conf
+      @name = conf.server || String.random(8)
+      @json_file = conf.json_file
+      @berksfile = conf.berksfile
+    end
+
+
+    attr_reader :conf,:attributes_json
+
+    def run
+      preparar_entorno
+
+      descargar_atributos unless conf.json_file
+
+      descargar_cookbooks unless conf.cached || conf.environment == 'development'
+
+      ejecutar_converger
+    end
+
+
+    private
+
+    def descargar_atributos
+      
+      # descargar atributos do servidor 
+      json_attributes = Lambom::ApiClient.new(conf).get_server_config
+
+      @json_file = "#{CACHE_PATH}/#{@name}.json"
+
+      file = File.new(@json_file,"w")
+      file.write(json_attributes)
+      file.close
+
+    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)
+        
+      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
+
+    #   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
+    #   }
+
+    #   run_cmd *cmd     
+
+    # 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{
+         -c #{CHEF_CONF_FILE}
+         --log_level #{conf.loglevel}
+         -j #{@json_file}
+      }
+      
+      unless $debug
+        cmd += [
+          "--logfile", 
+          "#{conf.logdir}/#{conf.logfile}"
+        ]
+      end
+
+      # 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)}
+      #ENV["PATH"] = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+      
+      #creamos directorio de logs
+      FileUtils.mkdir_p(conf.logdir) unless File.directory?(conf.logdir)
+      File.chmod(0750, conf.logdir)
+
+      #creamos o directorio cache de chef
+      FileUtils.mkdir_p(CACHE_PATH) unless File.directory?(CACHE_PATH)
+      File.chmod(0750,CACHE_PATH)
+
+      # establecemos o archivo de configuracion de chef segun o entorno
+      switch_chef_conf(conf.environment.to_sym)
+    end
+
+
+    def switch_chef_conf(env)
+      FileUtils.mkdir_p(Lambom::Config::CONFIG_DIR) unless File.directory?(Lambom::Config::CONFIG_DIR)
+      File.chmod(0750,Lambom::Config::CONFIG_DIR)
+
+      file = File.new(CHEF_CONF_FILE,"w")
+
+      if CHEF_CONF.has_key?(env)
+        file.write(CHEF_CONF[env])
+      else
+        file.write(CHEF_CONF[:other])
+      end
+
+
+      file.close
     end
+  end
 end

data/lib/lambom/shell_mixin.rb

@@ -2,33 +2,33 @@ require 'mixlib/shellout'
 require 'securerandom'
 
 module Lambom
-    module ShellMixin
-        
-        DEFAULT_TIMEOUT = 12000
-        
-        def run_cmd(*cmd)
-            # Seteamos a 200min o timeout por defecto
+  module ShellMixin
+    
+    DEFAULT_TIMEOUT = 12000
+    
+    def run_cmd(*cmd)
+      # Seteamos a 200min o timeout por defecto
 
-            opts = {:timeout => DEFAULT_TIMEOUT}
+      opts = {:timeout => DEFAULT_TIMEOUT}
 
-            if $debug
-                puts "RUN_CMD: #{cmd}"
-                opts[:live_stream] = STDOUT
-            end
+      if $debug
+        puts "RUN_CMD: #{cmd}"
+        opts[:live_stream] = STDOUT
+      end
 
-            com = Mixlib::ShellOut.new(cmd, opts)
+      com = Mixlib::ShellOut.new(cmd, opts)
 
-            com.run_command
-            com.error!
+      com.run_command
+      com.error!
 
-            puts "output: #{com.stdout}" if $debug
-            com.stdout
-        end
+      puts "output: #{com.stdout}" if $debug
+      com.stdout
+    end
 
-        class String
-            def self.random(n)
-                SecureRandom.hex(n)
-            end
-        end
+    class String
+      def self.random(n)
+        SecureRandom.hex(n)
+      end
     end
+  end
 end

data/lib/lambom/version.rb

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

data/lib/lambom.rb

@@ -13,25 +13,25 @@ require "lambom/converger"
 
 
 module Lambom
-    $debug = false
-
-    class << self
-        def run(argv)
-            puts "DEBUG ENABLED" if $debug
-            puts "Recived args: #{argv.inspect}" if $debug
-            raise 'Must be run as root' unless Process.uid == 0
-
-            #cargar config
-            conf = Lambom::Config.new.load(argv)
-            
-            # executar converxencia
-            Lambom::Converger.new(conf).run
-        end
+  $debug = false
+
+  class << self
+    def run(argv)
+      puts "DEBUG ENABLED" if $debug
+      puts "Recived args: #{argv.inspect}" if $debug
+      raise 'Must be run as root' unless Process.uid == 0
+
+      #cargar config
+      conf = Lambom::Config.new.load(argv)
+      
+      # executar converxencia
+      Lambom::Converger.new(conf).run
+    end
 
 
-        def enable_debug
-            $debug = true
-        end
+    def enable_debug
+      $debug = true
     end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lambom
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - J. Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj