chef-sync 0.0.2 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-sync (0.0.1)
+    chef-sync (0.0.4)
       chef
 
 GEM

data/bin/chef-sync

@@ -4,6 +4,17 @@ require 'optparse'
 require 'yaml'
 require 'chef-sync'
 
+CONFIG_PATH = '.chef-sync/config'
+
+DEFAULT_ROLE_MAPPING = {
+  'rails_server'     => [:app, :web],
+  'rails_utility'    => :resque
+}
+
+DEFAULT_CONFIG = {
+ 'roles' => DEFAULT_ROLE_MAPPING
+}
+
 options = {
   :stages => true,
   :mongo => true,
@@ -18,6 +29,7 @@ Capistrano multi-stage configuration, mongo server configuration, etc
 EOL
 
   opts.on('-t', '--target [DIR]', "Target Directory (defaults to current)") {|v| options[:target] = v }
+  opts.on('-i', '--init', "Initialize Default Config in target DIR") {|v| options[:init_config] = v }
   opts.on('-s', '--[no-]stages', "Sync config/stages.yml") {|v| options[:stages] = v }
   opts.on('-m', '--[no-]mongo', "Sync config/mongo.yml") {|v| options[:mongo] = v }
   opts.on_tail("-h", "--help", "Show this message") do
@@ -43,10 +55,13 @@ end
 def sync_stages(base_dir)
   yaml_path = File.join(base_dir, 'config', 'stages.yml')
   transform_yaml(yaml_path) do |stages_hash|
-    synchronized_roles = {
-      'rails_server'     => [:app, :web],
-      'rails_utility'    => :resque
-    }
+
+    config_file = File.join(base_dir, CONFIG_PATH)
+    synchronized_roles = if File.exists?(config_file)
+      JSON.parse(File.read(config_file))['roles']
+    else
+      DEFAULT_ROLE_MAPPING
+    end
 
     puts "----------------------------------------------------------"
     puts "- Synchronizing Cap config/stages.yml w/ Chef Node Set"
@@ -69,8 +84,27 @@ def sync_mongo(base_dir)
   end
 end
 
+def generate_default_config(base_dir)
+  config_file = File.join(base_dir, CONFIG_PATH)
+  if File.exists?(config_file)
+    puts "WARNING: #{config_file} exists."
+    puts "Continue? (CTRL+C to quit)"
+    gets
+  end
+
+  puts "----------------------------------------------------------"
+  puts "- Generating default config #{config_file}"
+  puts "----------------------------------------------------------"
+  %x{ mkdir -p #{File.dirname(config_file)} }
+  File.open(config_file, 'w') {|f| f.write( JSON.generate(DEFAULT_CONFIG) ) }
+end
+
 puts 'Target: '+options[:target]
 
+if options[:init_config]
+  generate_default_config(options[:target])
+  exit
+end
 
 sync_stages(options[:target]) if options[:stages]
 sync_mongo(options[:target]) if options[:mongo]

data/lib/chef-sync/utils.rb

@@ -7,7 +7,7 @@ module Chef::Sync::Utils
 
   def self.public_hostnames_by_role(role, environment)
     results = JSON.parse(exec_knife_node_search(role, environment))
-    hostnames = Array(results['rows']).map {|node| node['ec2']['public_hostname'] }
+    hostnames = Array(results['rows']).map {|node| node['ec2.public_hostname'] }
     hostnames.sort
   end
 
@@ -38,7 +38,7 @@ module Chef::Sync::Utils
 
 private
   def self.exec_knife_node_search(role, environment)
-    `knife search node 'role:#{ role } AND chef_environment:#{ environment }' -a ec2 -Fj`
+    `knife search node 'role:#{ role } AND chef_environment:#{ environment }' -a ec2.public_hostname -Fj`
   end
 
   def self.exec_knife_node_list(environment)

data/lib/chef-sync/version.rb

@@ -1,5 +1,5 @@
 module Chef
   module Sync
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/spec/fixtures/knife/node_search_ec2.json

@@ -2,60 +2,12 @@
   "results": 2,
   "rows": [
     {
-      "ec2": {
-        "kernel_id": "aki-825ea7eb",
-        "public_ipv4": "107.22.89.198",
-        "reservation_id": "r-020ac561",
-        "public_keys_0_openssh_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKUUG53xhavex/7g/mjlX8qnff6i+xtY+DiLzu1Z+OFu3SD6a3McGDt+vUp7RTTfnKLURMgHsxREomCMxAMrM6oksK+UU3sAD+8xOZRK2R+wQmcZg1aGPKZm6UteYxUSoyDK4RBw127FO63llrU/VBZZcsbxr3nZH3iIGvtL31M2KH4XC/p6YQ6urCIfARNuhAZKwMPtZCw0Y3fkCSzcViZ1LbMi2d1/kJYkVWY6bvV7IFkXAFhYyaFFlsD0ihk9jt/IOQUBLX0qzXSfQ72FvEqN7lGaw0B2c2C7+RBs1EE3ElgCT8ld+a0Sn+BWDwUaz7H7tN8+jRXPvmLtLSyUED katama-prod\n",
-        "local_ipv4": "10.242.67.15",
-        "local_hostname": "ip-10-242-67-15.ec2.internal",
-        "security_groups": [
-          "private_web"
-        ],
-        "hostname": "ip-10-242-67-15.ec2.internal",
-        "ami_id": "ami-4fa37426",
-        "placement_availability_zone": "us-east-1b",
-        "public_hostname": "ec2-107-22-89-198.compute-1.amazonaws.com",
-        "block_device_mapping_ami": "sda1",
-        "ami_launch_index": "0",
-        "ami_manifest_path": "ubuntu-us-east-1/images/ubuntu-oneiric-11.10-amd64-server-20120108.manifest.xml",
-        "instance_id": "i-d1da9ab5",
-        "userdata": null,
-        "profile": "default-paravirtual",
-        "instance_type": "m1.large",
-        "block_device_mapping_root": "/dev/sda1",
-        "block_device_mapping_ephemeral1": "sdc",
-        "block_device_mapping_ephemeral0": "sdb"
-      },
-      "id": "resque103.dav"
+      "ec2.public_hostname": "ec2-107-22-89-198.compute-1.amazonaws.com",
+      "id": "imagetranscode103.dav"
     },
     {
-      "ec2": {
-        "profile": "default-paravirtual",
-        "ami_id": "ami-4fa37426",
-        "local_ipv4": "10.46.214.63",
-        "local_hostname": "ip-10-46-214-63.ec2.internal",
-        "public_ipv4": "23.20.177.134",
-        "hostname": "ip-10-46-214-63.ec2.internal",
-        "userdata": null,
-        "security_groups": [
-          "private_web"
-        ],
-        "reservation_id": "r-d0f53ab3",
-        "ami_launch_index": "0",
-        "kernel_id": "aki-825ea7eb",
-        "block_device_mapping_ephemeral1": "sdc",
-        "placement_availability_zone": "us-east-1a",
-        "block_device_mapping_ephemeral0": "sdb",
-        "public_hostname": "ec2-23-20-177-134.compute-1.amazonaws.com",
-        "instance_id": "i-6fce8e0b",
-        "instance_type": "m1.large",
-        "ami_manifest_path": "ubuntu-us-east-1/images/ubuntu-oneiric-11.10-amd64-server-20120108.manifest.xml",
-        "public_keys_0_openssh_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKUUG53xhavex/7g/mjlX8qnff6i+xtY+DiLzu1Z+OFu3SD6a3McGDt+vUp7RTTfnKLURMgHsxREomCMxAMrM6oksK+UU3sAD+8xOZRK2R+wQmcZg1aGPKZm6UteYxUSoyDK4RBw127FO63llrU/VBZZcsbxr3nZH3iIGvtL31M2KH4XC/p6YQ6urCIfARNuhAZKwMPtZCw0Y3fkCSzcViZ1LbMi2d1/kJYkVWY6bvV7IFkXAFhYyaFFlsD0ihk9jt/IOQUBLX0qzXSfQ72FvEqN7lGaw0B2c2C7+RBs1EE3ElgCT8ld+a0Sn+BWDwUaz7H7tN8+jRXPvmLtLSyUED katama-prod\n",
-        "block_device_mapping_root": "/dev/sda1",
-        "block_device_mapping_ami": "sda1"
-      },
-      "id": "resque102.dav"
+      "ec2.public_hostname": "ec2-23-20-177-134.compute-1.amazonaws.com",
+      "id": "qa-imagetranscode001.hud"
     }
   ]
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -113,12 +113,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2457399180150779435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2457399180150779435
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23