mofa 0.1.7 → 0.2.0

data/lib/mofa.rb

@@ -3,6 +3,8 @@ end
 
 require 'mofa/version'
 require 'mofa/mofa_cmd'
+require 'mofa/provision_cmd'
+require 'mofa/upload_cmd'
 require 'mofa/hostlist'
 require 'mofa/runlist_map'
 require 'mofa/attributes_map'

data/lib/mofa/cli.rb

@@ -35,11 +35,35 @@ module Mofa
       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, attributes_map, token)
-      mofa_cmd.prepare
-      mofa_cmd.execute
-      mofa_cmd.cleanup
+      cmd = ProvisionCmd.new(token, cookbook)
 
+      cmd.hostlist = hostlist
+      cmd.runlist_map = runlist_map
+      cmd.attributes_map = attributes_map
+
+      cmd.prepare
+      cmd.execute
+      cmd.cleanup
+    end
+
+    desc 'upload <cookbook>', 'package & upload cookbook into binrepo'
+    method_option :binrepo_host, :type => :string
+    method_option :binrepo_ssh_user, :type => :string
+    method_option :binrepo_ssh_keyfile, :type => :string
+
+    def upload(cookbook_path)
+      set_verbosity
+
+      cookbook_path ||= '.'
+
+      token = MofaCmd.generate_token
+      cookbook = Cookbook.create(cookbook_path, token)
+
+      cmd = UploadCmd.new(token, cookbook)
+
+      cmd.prepare
+      cmd.execute
+      cmd.cleanup
     end
 
     desc 'config', 'prints out mofa config.'

data/lib/mofa/cookbook.rb

@@ -10,6 +10,8 @@ class Cookbook
   attr_accessor :name
   attr_accessor :version
   attr_accessor :type
+  attr_accessor :pkg_name
+  attr_accessor :pkg_dir
   attr_accessor :pkg_uri
   attr_accessor :source_uri
   attr_accessor :cookbooks_url
@@ -17,29 +19,28 @@ class Cookbook
   attr_accessor :mofa_yml_local
   attr_accessor :token
 
-  def self.create(cookbook_name_or_path='.', token=nil)
-    cb = nil
+  def self.create(cookbook_name_or_path, token)
+    cookbook = nil
     begin
       case
-        when cookbook_name_or_path.match(/:/)
+        when cookbook_name_or_path.match(/@/)
           fail "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
           fail "Did not find Version #{cookbook_version} of released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path, cookbook_version)
 
-          cb = ReleasedCookbook.new(cookbook_name_or_path)
+          cookbook = ReleasedCookbook.new(cookbook_name_or_path)
 
         else
-          cb = SourceCookbook.new(cookbook_name_or_path)
+          cookbook = SourceCookbook.new(cookbook_name_or_path)
       end
     rescue RuntimeError => e
       error e.message
       raise "Cookbook not found/detected!"
     end
-    cb.token = token
-    cb.autodetect_type
-    cb.load_mofa_yml
-    cb.load_mofa_yml_local
-    cb
-
+    cookbook.token = token
+    cookbook.autodetect_type
+    cookbook.load_mofa_yml
+    cookbook.load_mofa_yml_local
+    cookbook
   end
 
   def autodetect_type

data/lib/mofa/mofa_cmd.rb

@@ -4,215 +4,29 @@ require 'net/sftp'
 class MofaCmd
   attr_accessor :token
   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, 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
+  def initialize(token, cookbook)
+    @token = token
+    @cookbook = cookbook
   end
 
+  # @abstract
   def prepare
-    cookbook.prepare
+    raise RuntimeError, "must be implemented"
   end
 
+  # @abstract
   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)
-
-    puts "Hostlist after runlist filtering: #{hostlist.list.inspect}"
-
-    exit_code = run_chef_solo_on_hosts
-
-    exit_code
+    raise RuntimeError, "must be implemented"
   end
 
+  # @abstract
   def cleanup
-    cookbook.cleanup
-  end
-
-  # FIXME
-  # This Code is Copy'n'Pasted from the old mofa tooling. Only to make the MVP work in time!!
-  # This needs to be refactored ASAP.
-
-  def run_chef_solo_on_hosts
-    time = Time.new
-    puts
-    puts 'Chef-Solo Run started at ' + time.strftime('%Y-%m-%d %H:%M:%S')
-    puts "Will use ssh_user #{Mofa::Config.config['ssh_user']} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
-    at_least_one_chef_solo_run_failed = false
-    chef_solo_runs = {}
-    host_index = 0
-    hostlist.list.each do |hostname|
-      host_index = host_index + 1
-      puts
-      puts "----------------------------------------------------------------------"
-      puts "Chef-Solo on Host #{hostname} (#{host_index}/#{hostlist.list.length.to_s})"
-      puts "----------------------------------------------------------------------"
-      chef_solo_runs.store(hostname, {})
-
-      # do only one for faster dev-cycle...
-      #next unless hostname.match(/^dash/)
-
-      puts "Pinging host #{hostname}..."
-      exit_status = system("ping -q -c 1 #{hostname} >/dev/null 2>&1")
-      unless exit_status then
-        puts "  --> Host #{hostname} is unavailable!"
-        chef_solo_runs[hostname].store('status', 'UNAVAIL')
-        chef_solo_runs[hostname].store('status_msg', "Host #{hostname} unreachable.")
-      else
-        puts "  --> Host #{hostname} is available."
-        prerequesits_met = true
-        # Create a temp working dir on the target host
-        solo_dir = '/var/tmp/' + time.strftime('%Y-%m-%d_%H%M%S')
-        Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :verbose => :error) do |ssh|
-          puts "Remotely creating solo_dir \"#{solo_dir}\" on host #{hostname}"
-          # remotely create the temp folder
-          out = ssh_exec!(ssh, "[ -d #{solo_dir} ] || mkdir #{solo_dir}")
-          puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-
-          # 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|
-              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
-            end
-          end
-        end
-      end
-
-      # skip the rest if prerequesits are not met
-      next unless prerequesits_met
-
-
-      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :verbose => :error) do |sftp|
-
-        # remotely creating solo.rb
-        puts "Remotely creating \"#{solo_dir}/solo.rb\""
-        sftp.file.open("#{solo_dir}/solo.rb", "w") do |file|
-          solo_rb = <<-"EOF"
-        cookbook_path [ "#{solo_dir}/cookbooks" ]
-        data_bag_path "#{solo_dir}/data_bags"
-        log_level :info
-        log_location "#{solo_dir}/log"
-        verify_api_cert true
-          EOF
-
-          file.write(solo_rb)
-        end
-
-        # remotely creating node.json
-        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))
-        end
-
-        # 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|
-              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."
-            end
-          end
-        end
-
-        if cookbook.instance_of?(SourceCookbook)
-          puts "Cookbook is a SourceCookbook! Uploading Snapshot Package #{cookbook.pkg_name}... "
-          sftp.upload!("#{cookbook.pkg_dir}/#{cookbook.pkg_name}", "#{solo_dir}/#{cookbook.pkg_name}")
-          puts "OK."
-        end
-
-        # Do it -> Execute the chef-solo run!
-        Net::SSH.start(hostname, Mofa::Config::config['ssh_user'], :keys => [Mofa::Config::config['ssh_keyfile']], :verbose => :error) do |ssh|
-
-          if cookbook.instance_of?(SourceCookbook)
-            puts "Remotely unpacking Snapshot Package #{cookbook.pkg_name}... "
-            out = ssh_exec!(ssh, "cd #{solo_dir}; tar xvfz #{cookbook.pkg_name}")
-            if out[0] != 0
-              puts "ERROR (#{out[0]}): #{out[2]}"
-              puts out[1]
-            else
-              puts "OK."
-            end
-          end
-
-          puts "Remotely running chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json"
-          out = ssh_exec!(ssh, "sudo chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json")
-          if out[0] != 0
-            puts "ERROR (#{out[0]}): #{out[2]}"
-            out = ssh_exec!(ssh, "sudo cat #{solo_dir}/log")
-            puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-            puts out[1]
-            chef_solo_runs[hostname].store('status', 'FAIL')
-            chef_solo_runs[hostname].store('status_msg', out[1])
-          else
-            unless Mofa::CLI::option_debug
-              out = ssh_exec!(ssh, "sudo grep 'Chef Run' #{solo_dir}/log")
-              puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-              puts "Done."
-            else
-              out = ssh_exec!(ssh, "sudo cat #{solo_dir}/log")
-              puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-              puts out[1]
-            end
-            chef_solo_runs[hostname].store('status', 'SUCCESS')
-            chef_solo_runs[hostname].store('status_msg', '')
-          end
-          out = ssh_exec!(ssh, "sudo chown -R #{Mofa::Config.config['ssh_user']}.#{Mofa::Config.config['ssh_user']} #{solo_dir}")
-          puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-        end
-      end
-      at_least_one_chef_solo_run_failed = true if chef_solo_runs[hostname]['status'] == 'FAIL'
-    end
-
-    # ------- print out report
-    puts
-    puts "----------------------------------------------------------------------"
-    puts "Chef-Solo Run REPORT"
-    puts "----------------------------------------------------------------------"
-    puts "Chef-Solo has been run on #{chef_solo_runs.keys.length.to_s} hosts."
-
-    chef_solo_runs.each do |hostname, content|
-      status_msg = ''
-      status_msg = "(#{content['status_msg']})" if content['status'] == 'FAIL'
-      puts "#{content['status']}: #{hostname} #{status_msg}"
-    end
-
-    exit_code = 0
-    if at_least_one_chef_solo_run_failed
-      exit_code = 1
-    end
-
-    puts "Exiting with exit code #{exit_code}."
-    exit_code
-
+    raise RuntimeError, "must be implemented"
   end
 
   def ssh_exec!(ssh, command)
@@ -246,8 +60,5 @@ class MofaCmd
     [exit_code, stdout_data, stderr_data, exit_signal]
   end
 
-
-  private
-
 end
 

data/lib/mofa/provision_cmd.rb

@@ -0,0 +1,204 @@
+require 'net/ssh'
+require 'net/sftp'
+
+class ProvisionCmd < MofaCmd
+  attr_accessor :hostlist
+  attr_accessor :runlist_map
+  attr_accessor :attributes_map
+
+  def initialize(token, cookbook)
+    super(token, cookbook)
+  end
+
+  def prepare
+    cookbook.prepare
+  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)
+
+    puts "Hostlist after runlist filtering: #{hostlist.list.inspect}"
+
+    exit_code = run_chef_solo_on_hosts
+
+    exit_code
+  end
+
+  def cleanup
+    cookbook.cleanup
+  end
+
+  # FIXME
+  # This Code is Copy'n'Pasted from the old mofa tooling. Only to make the MVP work in time!!
+  # This needs to be refactored ASAP.
+
+  def run_chef_solo_on_hosts
+    time = Time.new
+    puts
+    puts 'Chef-Solo Run started at ' + time.strftime('%Y-%m-%d %H:%M:%S')
+    puts "Will use ssh_user #{Mofa::Config.config['ssh_user']}, ssh_port #{Mofa::Config.config['ssh_port']} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
+    at_least_one_chef_solo_run_failed = false
+    chef_solo_runs = {}
+    host_index = 0
+    hostlist.list.each do |hostname|
+      host_index = host_index + 1
+      puts
+      puts "----------------------------------------------------------------------"
+      puts "Chef-Solo on Host #{hostname} (#{host_index}/#{hostlist.list.length.to_s})"
+      puts "----------------------------------------------------------------------"
+      chef_solo_runs.store(hostname, {})
+
+      puts "Pinging host #{hostname}..."
+      exit_status = system("ping -q -c 1 #{hostname} >/dev/null 2>&1")
+      unless exit_status then
+        puts "  --> Host #{hostname} is unavailable!"
+        chef_solo_runs[hostname].store('status', 'UNAVAIL')
+        chef_solo_runs[hostname].store('status_msg', "Host #{hostname} unreachable.")
+      else
+        puts "  --> Host #{hostname} is available."
+        prerequesits_met = true
+        # Create a temp working dir on the target host
+        solo_dir = '/var/tmp/' + time.strftime('%Y-%m-%d_%H%M%S')
+        Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :port => Mofa::Config.config['ssh_port'], :verbose => :error) do |ssh|
+          puts "Remotely creating solo_dir \"#{solo_dir}\" on host #{hostname}"
+          # remotely create the temp folder
+          out = ssh_exec!(ssh, "[ -d #{solo_dir} ] || mkdir #{solo_dir}")
+          puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+
+          # 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|
+              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
+            end
+          end
+        end
+      end
+
+      # skip the rest if prerequesits are not met
+      next unless prerequesits_met
+
+
+      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :port =>  Mofa::Config.config['ssh_port'], :verbose => :error) do |sftp|
+
+        # remotely creating solo.rb
+        puts "Remotely creating \"#{solo_dir}/solo.rb\""
+        sftp.file.open("#{solo_dir}/solo.rb", "w") do |file|
+          solo_rb = <<-"EOF"
+        cookbook_path [ "#{solo_dir}/cookbooks" ]
+        data_bag_path "#{solo_dir}/data_bags"
+        log_level :info
+        log_location "#{solo_dir}/log"
+        verify_api_cert true
+          EOF
+
+          file.write(solo_rb)
+        end
+
+        # remotely creating node.json
+        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))
+        end
+
+        # 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|
+              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."
+            end
+          end
+        end
+
+        if cookbook.instance_of?(SourceCookbook)
+          puts "Cookbook is a SourceCookbook! Uploading Snapshot Package #{cookbook.pkg_name}... "
+          sftp.upload!("#{cookbook.pkg_dir}/#{cookbook.pkg_name}", "#{solo_dir}/#{cookbook.pkg_name}")
+          puts "OK."
+        end
+
+        # Do it -> Execute the chef-solo run!
+        Net::SSH.start(hostname, Mofa::Config::config['ssh_user'], :keys => [Mofa::Config::config['ssh_keyfile']], :port =>  Mofa::Config.config['ssh_port'], :verbose => :error) do |ssh|
+
+          if cookbook.instance_of?(SourceCookbook)
+            puts "Remotely unpacking Snapshot Package #{cookbook.pkg_name}... "
+            out = ssh_exec!(ssh, "cd #{solo_dir}; tar xvfz #{cookbook.pkg_name}")
+            if out[0] != 0
+              puts "ERROR (#{out[0]}): #{out[2]}"
+              puts out[1]
+            else
+              puts "OK."
+            end
+          end
+
+          puts "Remotely running chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json"
+          out = ssh_exec!(ssh, "sudo chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json")
+          if out[0] != 0
+            puts "ERROR (#{out[0]}): #{out[2]}"
+            out = ssh_exec!(ssh, "sudo cat #{solo_dir}/log")
+            puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+            puts out[1]
+            chef_solo_runs[hostname].store('status', 'FAIL')
+            chef_solo_runs[hostname].store('status_msg', out[1])
+          else
+            unless Mofa::CLI::option_debug
+              out = ssh_exec!(ssh, "sudo grep 'Chef Run' #{solo_dir}/log")
+              puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+              puts "Done."
+            else
+              out = ssh_exec!(ssh, "sudo cat #{solo_dir}/log")
+              puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+              puts out[1]
+            end
+            chef_solo_runs[hostname].store('status', 'SUCCESS')
+            chef_solo_runs[hostname].store('status_msg', '')
+          end
+          out = ssh_exec!(ssh, "sudo chown -R #{Mofa::Config.config['ssh_user']}.#{Mofa::Config.config['ssh_user']} #{solo_dir}")
+          puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+        end
+      end
+      at_least_one_chef_solo_run_failed = true if chef_solo_runs[hostname]['status'] == 'FAIL'
+    end
+
+    # ------- print out report
+    puts
+    puts "----------------------------------------------------------------------"
+    puts "Chef-Solo Run REPORT"
+    puts "----------------------------------------------------------------------"
+    puts "Chef-Solo has been run on #{chef_solo_runs.keys.length.to_s} hosts."
+
+    chef_solo_runs.each do |hostname, content|
+      status_msg = ''
+      status_msg = "(#{content['status_msg']})" if content['status'] == 'FAIL'
+      puts "#{content['status']}: #{hostname} #{status_msg}"
+    end
+
+    exit_code = 0
+    if at_least_one_chef_solo_run_failed
+      exit_code = 1
+    end
+
+    puts "Exiting with exit code #{exit_code}."
+    exit_code
+
+  end
+
+end

data/lib/mofa/released_cookbook.rb

@@ -1,18 +1,16 @@
 class ReleasedCookbook < Cookbook
-  attr_accessor :pkg_dir
-  attr_accessor :pkg_name
 
   def initialize(cookbook_name_or_path)
     super()
     # TODO: this needs proper vaidation!
-    @name = cookbook_name_or_path.split(/:/).first
-    @version = cookbook_name_or_path.split(/:/).last
+    @name = cookbook_name_or_path.split(/@/).first
+    @version = cookbook_name_or_path.split(/@/).last
   end
 
   # ------------- Interface Methods
 
   def prepare
-    @pkg_name = "#{name}-#{version}.tar.gz"
+    @pkg_name ||= "#{name}_#{version}-full.tar.gz"
     @pkg_dir = "#{Mofa::Config.config['tmp_dir']}/.mofa/#{token}"
   end
 

data/lib/mofa/runlist_map.rb

@@ -4,14 +4,14 @@ class RunlistMap
   attr_accessor :hostlist
   attr_accessor :token
   attr_accessor :option_runlist
-  attr_accessor :default_runlist
+  attr_accessor :default_runlist_recipes
 
   def self.create(cookbook, hostlist, token, option_runlist = nil)
     rl = RunlistMap.new
     rl.cookbook = cookbook
     rl.hostlist = hostlist
     rl.token = token
-    rl.default_runlist = (!option_runlist.nil?) ? option_runlist : nil
+    rl.default_runlist_recipes = (!option_runlist.nil?) ? option_runlist : nil
     rl
   end
 
@@ -20,7 +20,7 @@ class RunlistMap
   end
 
   def generate
-    @default_runlist ||= "recipe[#{cookbook.name}::default]"
+    @default_runlist_recipes ||= [ "#{cookbook.name}::default" ]
 
     case cookbook.type
       when 'env'
@@ -47,8 +47,10 @@ class RunlistMap
 
   def set_default_runlist_for_every_host
     hostlist.list.each do |hostname|
-      if cookbook.recipies.include?(@default_runlist.split(/::/)[1])
-        @mp.store(hostname,  @default_runlist)
+      puts "Default Runlist Recipes: #{@default_runlist_recipes}"
+      @default_runlist_recipes.each do |rl_entry|
+        next unless rl_entry.split(/::/)[0] == cookbook.name
+        @mp.store(hostname,  @default_runlist) if cookbook.recipes.include?(rl_entry.split(/::/)[1])
       end
     end
   end

data/lib/mofa/source_cookbook.rb

@@ -1,7 +1,4 @@
 class SourceCookbook < Cookbook
-  attr_accessor :pkg_dir
-  attr_accessor :pkg_name
-
   COOKBOOK_IGNORE=%w(.mofa .idea .kitchen .vagrant .bundle test)
 
   def initialize(cookbook_name_or_path)
@@ -12,6 +9,7 @@ class SourceCookbook < Cookbook
     @source_uri = "file://#{path.realpath}"
 
     say "source_dir=#{source_dir}"
+
     autodetect_name
     autodetect_version
   end
@@ -21,13 +19,14 @@ class SourceCookbook < Cookbook
   def prepare
     fail "Source URI is not a file:// URI!" unless source_uri =~ /^file:\/\/.*/
     fail "Folder #{source_dir} is not a Cookbook Folder!" unless cookbook_folder?(source_dir)
-    @pkg_name = "#{name}-#{token}-SNAPSHOT.tar.gz"
+
+    @pkg_name ||= "#{name}_#{version}-SNAPSHOT.tar.gz"
     @pkg_dir = "#{source_dir}/.mofa/#{token}"
   end
 
   def execute
     package
-    stage
+    set_cookbooks_url
   end
 
   def cleanup
@@ -37,6 +36,7 @@ class SourceCookbook < Cookbook
   end
 
   # ------------- /Interface Methods
+
   def source_dir
     source_uri.gsub(/^file:\/\//, '')
   end
@@ -75,7 +75,7 @@ class SourceCookbook < Cookbook
     end
   end
 
-  def stage
+  def set_cookbooks_url
     if mofahub_available?
       say 'Staging (uploading to mofa-hub) Cookbook Snapshot: '
       @cookbooks_url = upload_to_mofahub
@@ -115,7 +115,7 @@ class SourceCookbook < Cookbook
   end
 
   def cleanup_and_repackage
-    say "Shrinking Cookbook Snapshot #{pkg_name}... "
+    say "Shrinking Cookbook #{pkg_name}... "
 
     tar_verbose = (Mofa::CLI::option_debug) ? 'v' : ''
 

data/lib/mofa/upload_cmd.rb

@@ -0,0 +1,58 @@
+require 'net/ssh'
+require 'net/sftp'
+
+class UploadCmd < MofaCmd
+
+  def initialize(token, cookbook)
+    super(token, cookbook)
+  end
+
+  def prepare
+    fail unless binrepo_up?
+
+    # upload always means: package a release
+    cookbook.pkg_name = "#{cookbook.name}_#{cookbook.version}-full.tar.gz"
+    cookbook.prepare
+  end
+
+  def execute
+    cookbook.execute
+    upload_cookbook_pkg
+  end
+
+  def cleanup
+    cookbook.cleanup
+  end
+
+  def binrepo_up?
+    binrepo_up = true
+
+    exit_status = system("ping -q -c 1 #{Mofa::Config.config['binrepo_host']} >/dev/null 2>&1")
+    unless exit_status then
+      puts "  --> Binrepo host #{Mofa::Config.config['binrepo_host']} is unavailable!"
+      binrepo_up = false
+    end
+
+    puts "Binrepo #{ Mofa::Config.config['binrepo_ssh_user']}@#{Mofa::Config.config['binrepo_host']}:#{Mofa::Config.config['binrepo_import_dir']} not present or not reachable!" unless binrepo_up
+    binrepo_up
+
+  end
+
+  def upload_cookbook_pkg
+    puts "Will use ssh_user #{Mofa::Config.config['binrepo_ssh_user']} and ssh_key_file #{Mofa::Config.config['binrepo_ssh_keyfile']}"
+    puts "Uploading cookbook pkg #{cookbook.pkg_name} to binrepo import folder #{Mofa::Config.config['binrepo_host']}:#{Mofa::Config.config['binrepo_import_dir']}..."
+
+    fail unless binrepo_up?
+    begin
+      Net::SFTP.start(Mofa::Config.config['binrepo_host'], Mofa::Config.config['binrepo_ssh_user'], :keys => [Mofa::Config.config['binrepo_ssh_keyfile']], :port => Mofa::Config.config['binrepo_ssh_port'], :verbose => :error) do |sftp|
+        sftp.upload!("#{cookbook.pkg_dir}/#{cookbook.pkg_name}", "#{Mofa::Config.config['binrepo_import_dir']}/#{cookbook.pkg_name}")
+      end
+      puts "OK."
+    rescue RuntimeError => e
+      puts "Error: #{e.message}"
+      raise "Failed to upload cookbook #{cookbook.name}!"
+    end
+
+  end
+
+end

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -228,9 +228,11 @@ files:
 - lib/mofa/hostlist.rb
 - lib/mofa/mofa_cmd.rb
 - lib/mofa/mofa_yml.rb
+- lib/mofa/provision_cmd.rb
 - lib/mofa/released_cookbook.rb
 - lib/mofa/runlist_map.rb
 - lib/mofa/source_cookbook.rb
+- lib/mofa/upload_cmd.rb
 - lib/mofa/version.rb
 - mofa.gemspec
 homepage: https://github.com/pingworks/mofa