mofa 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1c040f77b572291d756fff5efda245dda9c8501c
+  data.tar.gz: 9e86ec9be601d46863449dd070142748b59cd8b2
+SHA512:
+  metadata.gz: 2c8263d05d553f4673f9450df9755fde8890f34816f85dfd786d5275ae94ccff6c2c51d61993a7fa7a0777c01324febae7d1c64a9f722e8845ac596177cb860e
+  data.tar.gz: d01aa5c8214ddfe139197675099985b1c83935f9c863add10448f14bd3f29e81af7baf6c04df0fb1137c5061a33eaddaee53cf6023b548d4b6c7462aa9bebfc4

data/lib/mofa.rb

@@ -5,10 +5,12 @@ require 'mofa/version'
 require 'mofa/mofa_cmd'
 require 'mofa/hostlist'
 require 'mofa/runlist_map'
+require 'mofa/attributes_map'
 require 'mofa/cookbook'
 require 'mofa/released_cookbook'
 require 'mofa/source_cookbook'
 require 'mofa/config'
+require 'mofa/mofa_yml'
 require 'thor'
 require 'fileutils'
 require 'yaml'

data/lib/mofa/attributes_map.rb

@@ -0,0 +1,37 @@
+class AttributesMap
+  attr_accessor :mp
+  attr_accessor :cookbook
+  attr_accessor :hostlist
+  attr_accessor :token
+  attr_accessor :option_runlist
+  attr_accessor :option_attributes
+
+  def self.create(cookbook, hostlist, token, option_runlist = nil, option_attributes = nil)
+    a = AttributesMap.new
+    a.cookbook = cookbook
+    a.hostlist = hostlist
+    a.token = token
+    a.option_runlist = option_runlist
+    a.option_attributes = option_attributes
+    a
+  end
+
+  def initialize
+    @mp = {}
+  end
+
+  def generate
+    attr_all_roles = cookbook.mofa_yml.get_attr_for_role('all')
+    attr_all_roles_local = cookbook.mofa_yml_local.get_attr_for_role('all')
+    attr_all_roles.merge!(attr_all_roles_local)
+    hostlist.list.each do |hostname|
+      # Again: the underlying rule here is -> shortname = role
+      attr_host_role = cookbook.mofa_yml.get_attr_for_role(Hostlist::get_role(hostname))
+      attr_host_role_local = cookbook.mofa_yml_local.get_attr_for_role(Hostlist::get_role(hostname))
+      attr_host_role.merge!(attr_host_role_local)
+      attr_per_host = attr_all_roles.merge(attr_host_role)
+      @mp.store(hostname, attr_per_host)
+    end
+  end
+
+end

data/lib/mofa/cli.rb

@@ -7,6 +7,8 @@ module Mofa
     include Thor::Actions
     include Mofa::Config
 
+    Mofa::Config.load
+
     @@option_verbose = false
     @@option_debug = false
 
@@ -16,8 +18,7 @@ module Mofa
     desc 'provision <cookbook>', 'provisions Targethost(s) using a given cookbook.'
     method_option :target, :type => :string, :aliases => '-t'
     method_option :runlist, :type => :string, :aliases => '-o'
-
-    Mofa::Config.load
+    method_option :service_hostlist_url, :type => :string
 
     def provision(cookbook_name_or_path)
       set_verbosity
@@ -29,13 +30,12 @@ module Mofa
 
       token = MofaCmd.generate_token
 
-      hostlist = Hostlist.create(target_filter)
+      hostlist = Hostlist.create(target_filter, options[:service_hostlist_url])
       cookbook = Cookbook.create(cookbook_name_or_path, token)
       runlist_map = RunlistMap.create(cookbook, hostlist, token, options[:runlist])
+      attributes_map = AttributesMap.create(cookbook, hostlist, token, options[:runlist], options[:attributes])
 
-      mofa_cmd = MofaCmd.create(cookbook, hostlist, runlist_map, token)
-
-
+      mofa_cmd = MofaCmd.create(cookbook, hostlist, runlist_map, attributes_map, token)
       mofa_cmd.prepare
       mofa_cmd.execute
       mofa_cmd.cleanup

data/lib/mofa/cookbook.rb

@@ -13,6 +13,8 @@ class Cookbook
   attr_accessor :pkg_uri
   attr_accessor :source_uri
   attr_accessor :cookbooks_url
+  attr_accessor :mofa_yml
+  attr_accessor :mofa_yml_local
   attr_accessor :token
 
   def self.create(cookbook_name_or_path='.', token=nil)
@@ -34,7 +36,8 @@ class Cookbook
     end
     cb.token = token
     cb.autodetect_type
-
+    cb.load_mofa_yml
+    cb.load_mofa_yml_local
     cb
 
   end
@@ -45,13 +48,14 @@ class Cookbook
     base_indicator = Mofa::Config.config['cookbook_type_indicator']['base']
 
     say "Autodetecting Cookbook Architectural Type... "
+
     case
       when @name.match(env_indicator)
         @type = 'env'
-      when @name.match(wrapper_indicator)
-        @type = 'wrapper'
       when @name.match(base_indicator)
         @type = 'base'
+      when @name.match(wrapper_indicator)
+        @type = 'wrapper'
       else
         @type = 'application'
     end

data/lib/mofa/hostlist.rb

@@ -9,21 +9,41 @@ class Hostlist
   attr_accessor :filter
   attr_accessor :api_key
 
-  def self.create(filter = nil)
+  def self.create(filter = nil, service_hostlist_url = nil)
     hl = Hostlist.new
     filter ||= Mofa::Config.config['service_hostlist_default_filter']
+    service_hostlist_url ||= Mofa::Config.config['service_hostlist_url']
     hl.filter = filter
     hl.service_host = Mofa::Config.config['service_hostlist_url'].gsub(/^http:\/\//, '').gsub(/\/.*$/, '').gsub(/:.*$/, '')
-    hl.service_url = Mofa::Config.config['service_hostlist_url']
+    hl.service_url = service_hostlist_url
     hl.api_key = Mofa::Config.config['service_hostlist_api_key']
     hl
   end
 
+  def self.get_shortname(hostname)
+    hostname.gsub(/\..*$/, '')
+  end
+
+  def self.get_role(hostname)
+    Hostlist::get_shortname(hostname).gsub(/\d+$/, '')
+  end
+
   def retrieve
-    fail "Hostlist Service not reachable! (cannot ping #{service_host})" unless up?
-    response = RestClient.get(@service_url, { :params => {:key => api_key}})
-    hosts_list_json = JSON.parse response.body
-    @list = hosts_list_json['data'].collect { |i| i['cname'] }
+    case
+      when @service_url.match(/^http/)
+        fail "Hostlist Service not reachable! (cannot ping #{service_host})" unless up?
+        response = RestClient.get(@service_url, {:params => {:key => api_key}})
+        hosts_list_json = JSON.parse response.body
+        @list = hosts_list_json['data'].collect { |i| i['cname'] }
+      when @service_url.match(/^file:/)
+        json_file = @service_url.gsub(/^file:\/\//, '')
+        if File.exist?(json_file)
+          hosts_list_json = JSON.parse(File.read(json_file))
+          @list = hosts_list_json['data'].collect { |i| i['cname'] }
+        end
+      else
+        fail "Hostlist Service Url either has to be a http(s):// or a file:/// Url!"
+    end
 
     apply_filter
     sort_by_domainname
@@ -43,7 +63,7 @@ class Hostlist
 
     puts "regex=#{regex}"
 
-    @list.select! {|hostname| hostname.match(regex) }
+    @list.select! { |hostname| hostname.match(regex) }
   end
 
   def sort_by_domainname
@@ -55,7 +75,7 @@ class Hostlist
   end
 
   def filter_by_runlist_map(runlist_map)
-    @list.select! { |hostname| runlist_map.mp.key?(hostname)}
+    @list.select! { |hostname| runlist_map.mp.key?(hostname) }
   end
 
 end

data/lib/mofa/mofa_cmd.rb

@@ -6,31 +6,34 @@ class MofaCmd
   attr_accessor :cookbook
   attr_accessor :hostlist
   attr_accessor :runlist_map
+  attr_accessor :attributes_map
 
   def self.generate_token
     Digest::SHA1.hexdigest([Time.now, rand].join)[0..10]
   end
 
-  def self.create(cookbook, hostlist, runlist_map, token)
+  def self.create(cookbook, hostlist, runlist_map, attributes_map, token)
     mofa_cmd = MofaCmd.new
     mofa_cmd.token = token
     mofa_cmd.cookbook = cookbook
     mofa_cmd.hostlist = hostlist
     mofa_cmd.runlist_map = runlist_map
+    mofa_cmd.attributes_map = attributes_map
     mofa_cmd
   end
 
   def prepare
     cookbook.prepare
-    fail "Hostlist Service not reachable! (cannot ping #{hostlist.service_url})" unless hostlist.up?
   end
 
   def execute
     cookbook.execute
     hostlist.retrieve
     runlist_map.generate
+    attributes_map.generate
 
     puts "Runlist Map: #{runlist_map.mp.inspect}"
+    puts "Attributes Map: #{attributes_map.mp.inspect}"
     puts "Hostlist before runlist filtering: #{hostlist.list.inspect}"
 
     hostlist.filter_by_runlist_map(runlist_map)
@@ -87,7 +90,7 @@ class MofaCmd
 
           # remotely create a data_bags folder structure on the target host
           if File.directory?("#{cookbook.source_dir}/data_bags")
-            Dir.entries("#{cookbook.source_dir}/data_bags").select{|f| !f.match(/^\.\.?$/)}.each do |data_bag|
+            Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| !f.match(/^\.\.?$/) }.each do |data_bag|
               puts "Remotely creating data_bags dir \"#{solo_dir}/data_bags/#{data_bag}\""
               out = ssh_exec!(ssh, "[ -d #{solo_dir}/data_bags/#{data_bag} ] || mkdir -p #{solo_dir}/data_bags/#{data_bag}")
               puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
@@ -120,6 +123,9 @@ class MofaCmd
         puts "Remotely creating \"#{solo_dir}/node.json\""
         node_json = {}
         node_json.store('run_list', runlist_map.mp[hostname])
+        attributes_map.mp[hostname].each do |key, value|
+          node_json.store(key, value)
+        end
 
         sftp.file.open("#{solo_dir}/node.json", "w") do |file|
           file.write(JSON.pretty_generate(node_json))
@@ -127,8 +133,8 @@ class MofaCmd
 
         # remotely create data_bag items
         if File.directory?("#{cookbook.source_dir}/data_bags")
-          Dir.entries("#{cookbook.source_dir}/data_bags").select{|f| !f.match(/^\.\.?$/)}.each do |data_bag|
-            Dir.entries("#{cookbook.source_dir}/data_bags/#{data_bag}").select{|f| f.match(/\.json$/)}.each do |data_bag_item|
+          Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| !f.match(/^\.\.?$/) }.each do |data_bag|
+            Dir.entries("#{cookbook.source_dir}/data_bags/#{data_bag}").select { |f| f.match(/\.json$/) }.each do |data_bag_item|
               puts "Uploading data_bag_item #{data_bag_item}... "
               sftp.upload!("#{cookbook.source_dir}/data_bags/#{data_bag}/#{data_bag_item}", "#{solo_dir}/data_bags/#{data_bag}/#{data_bag_item}")
               puts "OK."

data/lib/mofa/mofa_yml.rb

@@ -0,0 +1,40 @@
+class MofaYml
+  attr_accessor :cookbook
+  attr_accessor :yml
+
+  def initialize
+    @yml = {}
+  end
+
+  def self.load_from_file(path_to_mofayml, cookbook)
+    mfyml = MofaYml.new
+    mfyml.cookbook = cookbook
+    if File.exist?(path_to_mofayml)
+      mfyml.parse_and_load(path_to_mofayml)
+    end
+    mfyml
+  end
+
+  def get_attr_for_role(role_name)
+    attr = {}
+    if @yml.key?('roles') # && @yml['roles'].kind_of?(Array)
+      @yml['roles'].each do |role|
+        if role.key?('name') && role['name'] == role_name
+          if role.key?('attributes')
+            attr = role['attributes']
+          end
+        end
+      end
+    end
+    attr
+  end
+
+  def parse_and_load(path_to_mofayml)
+    # for now only __ENV_COOKBOOK__ for cookbook name is supported
+    file_contents = File.read(path_to_mofayml)
+    file_contents.gsub!(/__ENV_COOKBOOK__/, @cookbook.name)
+    puts "FileContents: #{file_contents}"
+    @yml = YAML.load(file_contents)
+    puts "Parsed: #{@yml}"
+  end
+end

data/lib/mofa/runlist_map.rb

@@ -47,7 +47,9 @@ class RunlistMap
 
   def set_default_runlist_for_every_host
     hostlist.list.each do |hostname|
-      @mp.store(hostname, @default_runlist)
+      if cookbook.recipies.include?(@default_runlist.split(/::/)[1])
+        @mp.store(hostname,  @default_runlist)
+      end
     end
   end
 

data/lib/mofa/source_cookbook.rb

@@ -41,6 +41,14 @@ class SourceCookbook < Cookbook
     source_uri.gsub(/^file:\/\//, '')
   end
 
+  def load_mofa_yml
+    @mofa_yml = MofaYml.load_from_file("#{source_dir}/.mofa.yml", self)
+  end
+
+  def load_mofa_yml_local
+    @mofa_yml_local = MofaYml.load_from_file("#{source_dir}/.mofa.local.yml", self)
+  end
+
   def autodetect_name
     say "Autodetecting Cookbook Name... "
     @name = open("#{source_dir}/metadata.rb").grep(/^name/)[0].gsub(/^name[^a-zA-Z0-9_-]*/, '').gsub(/.$/, '').chomp
@@ -54,8 +62,8 @@ class SourceCookbook < Cookbook
   end
 
   def recipes
-    recipes = Dir.entries("#{source_dir}/recipes").select {|f| f.match(/.rb$/)}
-    recipes.map! {|f| f.gsub(/\.rb/, '')}
+    recipes = Dir.entries("#{source_dir}/recipes").select { |f| f.match(/.rb$/) }
+    recipes.map! { |f| f.gsub(/\.rb/, '') }
   end
 
   def cleanup!

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/mofa.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = Mofa::VERSION
   s.authors = ["Alexander Birk"]
   s.email = ["birk@pingworks.de"]
-  s.homepage = "https://github.com/birka/mofa"
+  s.homepage = "https://github.com/pingworks/mofa"
   s.summary = %q{a lightweight remote chef-solo runner}
   s.description = %q{a lightweight remote chef-solo runner}
   s.rubyforge_project = "mofa"
@@ -26,4 +26,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "net-ping"
   s.add_runtime_dependency "user_config"
   s.add_runtime_dependency "chronic"
-end
+end

metadata

@@ -1,206 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Alexander Birk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: user_config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: a lightweight remote chef-solo runner
@@ -221,38 +196,40 @@ files:
 - bin/mofa
 - config.yml.erb
 - lib/mofa.rb
+- lib/mofa/attributes_map.rb
 - lib/mofa/cli.rb
 - lib/mofa/config.rb
 - lib/mofa/cookbook.rb
 - lib/mofa/hostlist.rb
 - lib/mofa/mofa_cmd.rb
+- lib/mofa/mofa_yml.rb
 - lib/mofa/released_cookbook.rb
 - lib/mofa/runlist_map.rb
 - lib/mofa/source_cookbook.rb
 - lib/mofa/version.rb
 - mofa.gemspec
-homepage: https://github.com/birka/mofa
+homepage: https://github.com/pingworks/mofa
 licenses: []
+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: mofa
-rubygems_version: 1.8.23
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a lightweight remote chef-solo runner
 test_files: []
+has_rdoc: