lambom 0.3.5 → 0.4.2

data/README.md

@@ -0,0 +1,37 @@
+lambom
+======
+
+lambom is a tool to configure servers based on chef-solo and berkshelf.
+
+Description
+-----------
+Riyic is a server configuration service based on chef (http://riyic.com).
+
+The lambom gem is a tool to apply chef configurations generated with the riyic service, or defined in a pair of plain text files :
+ - a [json attributes file](http://docs.opscode.com/chef_solo.html#attributes) where the server configuration is detailed
+ - and a [berkshelf](http://github.com/berkshelf/berkshelf) file which specifies cookbooks restrictions and sources
+
+Usage
+-----
+```
+Usage: lambom [options]
+    -A, --api [API ENDPOINT URL]     RIYIC Api endpoint to connect to download the server configuration
+    -j, --json [JSON FILE]           Run server convergence with configuration from json attributes file
+    -b, --berksfile [BERKSFILE FILE] Use specified berksfile to download cookbooks and dependencies
+    -c, --cached                     Use local cached cookbooks
+    -D, --download [TARBALL URL]     Download cookbooks tarball from url and unpack it in cookbooks chef path
+    -e, --env [ENVIRONMENT]          Select environment
+    -s, --server [SERVER_UUID]       Sets the server uuid to which to download configuration from RIYIC api
+    -k, --keyfile [PRIVATE KEYFILE]  PEM Private keyfile to sign api requests
+    -l, --loglevel [LOG_LEVEL]       Set loglevel
+    -d, --debug                      Debug mode
+    -v, --version                    Show version
+```
+
+Requirements
+------------
+- Tested in Ubuntu-12.04
+- ruby 1.9.3
+- chef ~> 11.8.2
+- berkshelf ~> 2.0.12
+- git

data/bin/lambom

@@ -14,18 +14,39 @@ options = {}
 OptionParser.new do |opts|
     opts.banner = "Usage: lambom [options]"
 
+    opts.on("-A", "--api [API ENDPOINT URL]",
+           "RIYIC Api endpoint to connect to download the server configuration") do |j|
+        options[:api_url] = j
+    end
+
     opts.on("-j", "--json [JSON FILE]",
-           "Run server configuration with json attributes file") do |j|
+           "Run server convergence with configuration from json attributes file") do |j|
         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("-c", "--cached",
+           "Use local cached cookbooks") do
+        options[:cached] = true
+    end
+
+    opts.on("-D", "--download [TARBALL URL]",
+           "Download cookbooks tarball from url and unpack it in cookbooks chef path") do |d|
+        options[:download_tarball] = d
+    end
+
+
     opts.on("-e", "--env [ENVIRONMENT]",
             "Select environment") do |e|
         options[:environment] = e
     end
 
     opts.on("-s", "--server [SERVER_UUID]",
-            "Set server to which get configuration from riyic api") do |s|
+            "Sets the server uuid to which to download configuration from RIYIC api") do |s|
         options[:server] = s
     end
 
@@ -41,7 +62,7 @@ OptionParser.new do |opts|
     
     opts.on("-d","--debug",
             "Debug mode") do
-	Lambom.enable_debug
+        Lambom.enable_debug
     end
     
     opts.on_tail("-v", "--version", "Show version") do

data/lambom.gemspec

@@ -6,9 +6,14 @@ require "lambom/version"
 Gem::Specification.new do |s|
   s.name        = 'lambom'
   s.version     = Lambom::VERSION
-  s.date        = '2013-12-23'
-  s.summary     = "Tool to apply riyic configurations"
-  s.description = "Riyic is a server configuration service based on chef (http://riyic.com). The lambom gem is a tool to apply, through chef-solo, your riyic configurations in your server"
+  s.date        = '2014-01-21'
+  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).
+The lambom gem is a tool to apply chef configurations generated with the riyic service, or defined in a pair of plain text files 
+(a json attributes file where the server configuration is detailed and a berkshelf file which specifies cookbooks restrictions and sources).
+EOF
+
   s.authors     = ["J. Gomez"]
   s.email       = 'alambike@gmail.com'
   s.require_paths = ["lib"]
@@ -16,9 +21,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.license       = 'Apache-2.0'
 
-  s.add_runtime_dependency "oj","~> 2.0"
-  s.add_runtime_dependency "mixlib-authentication","~> 1.3"
-  s.add_runtime_dependency "mixlib-shellout","~> 1.3"
+  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_development_dependency "rspec", "~> 2.0"
 

data/lib/lambom.rb

@@ -19,7 +19,7 @@ module Lambom
         def run(argv)
             puts "DEBUG ENABLED" if $debug
             puts "Recived args: #{argv.inspect}" if $debug
-            raise 'Must run as root' unless Process.uid == 0
+            raise 'Must be run as root' unless Process.uid == 0
 
             #cargar config
             conf = Lambom::Config.new.load
@@ -27,16 +27,8 @@ module Lambom
             # sobreescribimos a configuracion ca linea de comandos
             conf.merge(argv)
 
-            attributes = {}
-            # descargar atributos do servidor (a menos que nos pasen json_file => file.json)
-            if argv.has_key?(:json_file)
-                json_attributes = IO.read(argv[:json_file])
-            else
-                json_attributes = Lambom::ApiClient.new(conf).get_server_config
-            end
-
             # executar converxencia
-            Lambom::Converger.new(conf,json_attributes).run
+            Lambom::Converger.new(conf).run
         end
 
 

data/lib/lambom/api.rb

@@ -7,20 +7,14 @@ require 'net/http'
 
 module Lambom
     class ApiClient
-        API_URL = {
-            #:production => "https://riyic.com/api/v1",
-            :production => "http://www2.ruleyourcloud.com/api/v1",
-            :development => "http://10.0.3.1:3000/api/v1"
-        }
+        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 = (@env == "production")?
-                API_URL[:production]:
-                API_URL[:development]
+            @api_url = conf.api_url || DEFAULT_API_URL
         end
 
         def get_server_config
@@ -28,6 +22,10 @@ module Lambom
 
         end
 
+        def get_berksfile
+            get("servers","#{@server_id}/berksfile")
+        end
+
 
 
         def get(controller, action='',params={})
@@ -57,7 +55,7 @@ module Lambom
             end
             
             http = Net::HTTP.new(uri.host, uri.port)
-            #http.use_ssl = true
+            http.use_ssl = true if uri.scheme == 'https'
 
             response = http.request(req)
             puts response.body if $debug
@@ -105,7 +103,6 @@ module Lambom
               :user_id => server_id.to_s,
               :http_method => request.method.to_s,
               :timestamp => Time.now.iso8601,
-              #:file => MockFile.new,
               :path => request.path.to_s,
               :proto_version => 1.1
             }

data/lib/lambom/config.rb

@@ -4,18 +4,33 @@ 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
+        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
@@ -56,19 +71,30 @@ module Lambom
         end
 
         def validate(parametro,valor)
+
             case parametro.to_sym
             when :server
                 # uuid
                 valor =~ /^[\d\w\-]{36}$/
             when :private_key_file
                 #unix path
-                valor =~ /^[\w\s.\/\-_+%]+$/i
+                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}"

data/lib/lambom/converger.rb

@@ -1,9 +1,8 @@
+#require "berkshelf/cli"
 module Lambom
     class Converger
         include ShellMixin
         
-        COOKBOOKS_URL = 'http://www2.ruleyourcloud.com/cookbooks.tar.gz'
-        
         DEFAULT_CHEF_PATH = '/var/chef'
         
         CACHE_PATH = "#{DEFAULT_CHEF_PATH}/cache"
@@ -36,9 +35,11 @@ EOF
             :other => CHEF_CONF_OTHER,
         }
 
-        def initialize(conf, json)
+        def initialize(conf)
             @conf = conf
-            @attributes_json = json
+            @name = conf.server || String.random(8)
+            @json_file = conf.json_file
+            @berksfile = conf.berksfile
         end
 
 
@@ -47,7 +48,9 @@ EOF
         def run
             preparar_entorno
 
-            descargar_cookbooks
+            descargar_atributos unless conf.json_file
+
+            descargar_cookbooks unless conf.cached || conf.environment == 'development'
 
             ejecutar_converger
         end
@@ -55,19 +58,69 @@ EOF
 
         private
 
-        def ejecutar_converger
-            name = conf.server || String.random(8)
+        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)
+            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
 
-            filename = "#{CACHE_PATH}/#{name}.json"
-            file = File.new(filename,"w")
-            file.write(attributes_json)
+        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 berks_install
+        #     Berkshelf::Cli.new.invoke('berkshelf:install', 
+        #         ['-b',@berksfile,'-p',"#{DEFAULT_CHEF_PATH}/cookbooks"],
+        #         :config => '/tmp/test')
+        # end
+
+
+        def ejecutar_converger
 
             cmd = %W{
                chef-solo
                -c #{CHEF_CONF_FILE}
                --log_level #{conf.loglevel}
-               -j #{filename}
+               -j #{@json_file}
             }
             
             unless $debug
@@ -97,16 +150,6 @@ EOF
             switch_chef_conf(conf.environment.to_sym)
         end
 
-        def descargar_cookbooks
-            unless (conf.environment == 'development')
-                # aqui podemos meter unha ejecucion de berkshelf para descargar os cookbooks necesarios
-                temp = "/tmp/cookbooks.tar.gz"
-                run_cmd('curl','-o',temp, '-L',COOKBOOKS_URL)
-                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
-        end
 
         def switch_chef_conf(env)
             FileUtils.mkdir_p(Lambom::Config::CONFIG_DIR) unless File.directory?(Lambom::Config::CONFIG_DIR)

data/lib/lambom/version.rb

@@ -1,3 +1,3 @@
 module Lambom
-    VERSION = "0.3.5"
+    VERSION = "0.4.2"
 end

data/spec/api_client_spec.rb

@@ -6,7 +6,8 @@ describe Lambom::ApiClient do
     
     conf.merge(environment: "production",
               server: "4586273f-f17a-4984-99ef-69c255e1b395",
-              private_key_file: "spec/private_key.pem")
+              private_key_file: "spec/private_key.pem",
+              api_url: "http://172.17.42.1:3000/api/v1")
 
     api = Lambom::ApiClient.new(conf)
 

data/spec/config_spec.rb

@@ -14,12 +14,18 @@ describe Lambom::Config do
         it "must have test file values" do
             expect(config.server).to eq("1ca71cd6-08c4-4855-9381-2f41aeffe59c")
             expect(config.environment).to eq("development")
-            expect(config.private_key_file).to eq("/etc/riyic/private.pem")
+            expect(config.private_key_file).to eq("spec/private_key.pem")
             expect(config.loglevel).to eq("debug")
+            expect(config.berksfile).to eq("spec/test_berksfile")
+            expect(config.json_file).to eq("spec/test_json_file")
+            expect(config.cached).to eq(false)
+            expect(config.api_url).to eq("https://www.riyic.com/api/v1")
+            expect(config.download_tarball).to eq("https://www.riyic.com/cookbooks.tar.gz")
+
         end
 
         it "must have merged values" do
-            merge_key_file = 'test.pem'
+            merge_key_file = 'spec/test_private_key.pem'
             merge_server = "1ca71cd6-08c4-4855-9381-111111111111"
             merge_env = 'test'
             merge_loglevel = 'info'

data/spec/converger_spec.rb

@@ -7,23 +7,14 @@ describe Lambom::Converger do
     conf.merge(:environment => "production",
               :server => "4586273f-f17a-4984-99ef-69c255e1b395",
               :private_key_file => "spec/private_key.pem",
-              :loglevel => 'info' )
-    json = <<EOF
-{
-  "riyic": {
-    "dockerized": "no",
-    "updates_check_interval": "never",
-    "env": "development"
-  },
-  "run_list": [
-    "recipe[riyic::default]"
-  ]
-}
-EOF
+              :loglevel => 'info',
+              :json_file => 'spec/test_json_file',
+              :api_url => 'http://172.17.42.1:3000/api/v1' )
+
 
     it "must run convergence tool" do
         expect{
-            Lambom::Converger.new(conf, json).run
+            Lambom::Converger.new(conf).run
         }.not_to raise_error
     end
 end

data/spec/test_config.yml

@@ -1,4 +1,9 @@
 server: 1ca71cd6-08c4-4855-9381-2f41aeffe59c
 environment: development
-private_key_file: /etc/riyic/private.pem
+private_key_file: spec/private_key.pem
 loglevel: debug
+berksfile: spec/test_berksfile
+json_file: spec/test_json_file
+cached: false
+api_url: https://www.riyic.com/api/v1
+download_tarball: https://www.riyic.com/cookbooks.tar.gz

data/spec/test_json_file

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambom
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        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: 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,9 +107,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Riyic is a server configuration service based on chef (http://riyic.com).
-  The lambom gem is a tool to apply, through chef-solo, your riyic configurations
-  in your server
+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
+  and sources).\n"
 email: alambike@gmail.com
 executables:
 - lambom
@@ -86,6 +120,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- README.md
 - bin/lambom
 - lambom.gemspec
 - lib/lambom.rb
@@ -100,9 +135,12 @@ files:
 - spec/private_key.pem
 - spec/public_key.pem
 - spec/spec_helper.rb
+- spec/test_berksfile
 - spec/test_config.yml
 - spec/test_config_bad_options.yml
 - spec/test_config_bad_yaml.yml
+- spec/test_json_file
+- spec/test_private_key.pem
 homepage: https://github.com/RIYIC/lambom
 licenses:
 - Apache-2.0
@@ -127,5 +165,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Tool to apply riyic configurations
+summary: Tool to configure servers based on chef-solo and berkshelf
 test_files: []