noc 0.0.6 → 1.0.0

data/README.rdoc

@@ -1,6 +1,9 @@
 = noc
 
-Describe your project here
+Vagrant helper
+
+Upload stuff to chef server:
+upload cluster | user(s) | book(s) | role(s) | bag(s) | env(s)
 
 :include:noc.rdoc
 

data/bin/noc

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 require 'gli'
-begin # XXX: Remove this begin/rescue before distributing your app
+#begin # XXX: Remove this begin/rescue before distributing your app
 require 'noc'
-rescue LoadError
-  STDERR.puts "In development, you need to use `bundle exec bin/todo` to run your app"
-  STDERR.puts "At install-time, RubyGems will make sure lib, etc. are in the load path"
-  STDERR.puts "Feel free to remove this message from bin/todo now"
-  exit 64
-end
+#rescue LoadError
+#  STDERR.puts "In development, you need to use `bundle exec bin/todo` to run your app"
+#  STDERR.puts "At install-time, RubyGems will make sure lib, etc. are in the load path"
+#  STDERR.puts "Feel free to remove this message from bin/todo now"
+#  exit 64
+#end
 
 
 CHEF=".chef"
@@ -35,74 +35,50 @@ flag [:c,:clusterfile]
 desc 'Scaffold the cluster'
 arg_name 'options'
 command :init do |c|
-  # c.desc 'Describe a switch to init'
-  # c.switch :s
 
-  # c.desc 'Describe a flag to init'
-  # c.default_value 'default'
-  # c.flag :f
   c.action do |global_options,options,args|
-    case
-    when args[0] == "solo"
-      puts "Init solo"
-
-    when args[0] == "repo"
-      system("git clone git://github.com/opscode/chef-repo.git #{args[1]}") unless args[1].nil?
+    case args[0]
 
-    when args[0] == "users"
+    when "users"
       users_dir = File.join(DATABAGS,"users")
       Dir.mkdir(users_dir) unless File.exists?(users_dir)
 
       $cluster[:users].each do |user|
         json = File.join( users_dir, user, ".json")
-        if File.exists?(json) then
-          raise "File exists #{json}"
-        end
+        raise "File exists #{json}" if File.exists?(json)
 
-        # gen key
         key = File.join( users_dir, user, ".key" )
-        if File.exists?(key) then
-          raise "File exists #{key}"
-        end
+        raise "File exists #{key}" if File.exists?(key)
 
         system( "ssh-keygen -b 2048 -f #{key}" )
         pub = IO.read("#{key}.pub")
-
       end
 
-    when args[0] == "bags"
+    when "bags"
       %w[clusters users secrets].each do |b|
         system("knife data bag create #{b}")
       end
 
-    when args[0] == "vagrant"
+    when "vagrant"
       # create vagrantfile
-      if File.exists?(VAGRANTFILE) then
-        raise "File exists #{VAGRANTFILE}"
-      end
+      raise "File exists #{VAGRANTFILE}" if File.exists?(VAGRANTFILE)
       template = File.join(File.dirname(__FILE__), '..', 'templates', VAGRANTFILE + ".erb" )
-      if not File.exists?(template) then
-        raise "Template not found: #{template}"
-      end
+      raise "Template not found: #{template}" if not File.exists?(template)
+
       File.open( VAGRANTFILE, 'w' ) do |f|
         f.write( Erubis::Eruby.new(File.new(template).read).result({:clusterfile => global_options[:clusterfile],
                                                             :cluster => $cluster}))
       end
 
-    when args[0].nil?
-      if File.exists?(CHEF_KNIFE) then
-        raise "File exists #{CHEF_KNIFE}"
-      end
-      if $cluster[:knife].nil? then
-        raise "No knife section in cluster"
-      end
+    when nil
+      raise "File exists #{CHEF_KNIFE}" if File.exists?(CHEF_KNIFE)
+      raise "No knife section in cluster" if $cluster[:knife].nil?
+
       # create chef directory
       Dir.mkdir(CHEF) unless File.exists?(CHEF)
       # knife.rb template
       template = File.join(File.dirname(__FILE__), '..', 'templates', KNIFE + ".erb" )
-      if not File.exists?(template) then
-        raise "Template not found: #{template}"
-      end
+      raise "Template not found: #{template}" if not File.exists?(template)
       # create knife.rb
       File.open( CHEF_KNIFE, 'w' ) do |f|
         f.write( Erubis::Eruby.new(File.new(template).read).result($cluster[:knife]) )
@@ -118,8 +94,8 @@ desc 'Download stuff'
 arg_name 'COMMAND [options]'
 command :download do |c|
   c.action do |global_options,options,args|
-    case
-    when args[0] == 'books'
+    case args[0]
+    when 'books'
       $cluster[:cookbooks].each do |b|
         system("knife cookbook site install #{b}")
       end
@@ -128,68 +104,59 @@ command :download do |c|
 end
 
 
-desc 'Upload cookbook, role, databag'
+desc 'Upload: cluster user(s) book(s) role(s) bag(s) env(s)'
 arg_name 'COMMAND [options]'
 command :upload do |c|
   c.desc 'force'
   c.switch :f
 
   c.action do |global_options,options,args|
-    case
-    when args[0] == 'books'
+    case args[0]
+    when 'books'
       system("knife cookbook upload --all")
-    when args[0] == "book"
+    when 'book'
       args.shift
       args.each do |a|
         system("knife cookbook upload #{a}")
       end
 
-    when args[0] == "roles"
+    when 'roles'
       Dir.glob("roles/*.rb").each do |f|
         system("knife role from file #{f}")
       end
-    when args[0] == "role"
+    when 'role'
       system("knife role from file roles/#{args[1]}.rb")
 
-    when args[0] == "envs"
+    when 'envs'
       Dir.glob("environments/*.rb").each do |f|
         system("knife environment from file #{f}")
       end
-    when args[0] == "env"
+    when 'env'
       system("knife environment from file environments/#{args[1]}.rb")
 
-    when args[0] == "cluster"
+    when 'cluster'
       data_bag = File.join( "data_bags", "clusters", "#{$cluster[:id]}.json" )
       if File.exists?( data_bag ) then
-        if not options[:f] then
-          raise "Cluster found: #{data_bag}"
-        end
+        raise "Cluster found: #{data_bag}" if not options[:f]
       end
       data_bag_dir = File.join( "data_bags", "clusters" )
       Dir.mkdir(data_bag_dir) unless File.exists?(data_bag_dir)
       File.open( data_bag, 'w' ) do |f|
         f.write( $cluster.to_json )
       end
+      system("knife data bag create clusters")
       system("knife data bag from file clusters #{$cluster[:id]}.json")
 
-    when args[0] == "users"
+    when 'users'
+      system("knife data bag create users")
       Dir.glob("data_bags/users/*.json").each do |f|
         system("knife data bag from file users #{File.basename(f)}")
       end
-    when args[0] == "user"
+    when 'user'
       system("knife data bag from file users #{args[1]}.json")
 
-    when args[0] == "bags"
-      if args[1].nil? then
-        raise "Set bag"
-      end
-      system("knife data bag create #{args[1]}")
-      Dir.glob("data_bags/#{args[1]}/*.json").each do |f|
-        system("knife data bag from file #{args[1]} #{File.basename(f)}")
-      end
+    end
 
-    end # upload
-    puts "upload command ran"
   end
 end
 
@@ -198,8 +165,8 @@ desc 'Delete client from chef server'
 arg_name 'COMMAND [options]'
 command :delete do |c|
   c.action do |global_options,options,args|
-    case
-    when args[0] == 'client'
+    case args[0]
+    when 'client'
       system("knife client delete #{args[1]}")
       system("knife node delete #{args[1]}")
     end
@@ -221,7 +188,7 @@ pre do |global,command,options,args|
     STDERR.puts e.message
     # STDERR.puts "ERROR: No infrastructure .yml file provided."
     exit(-1)
-  end unless command.names == "init" and args[0] == "repo"
+  end
 
   true
 end

data/lib/noc/version.rb

@@ -1,3 +1,3 @@
 module Noc
-  VERSION = '0.0.6'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,21 +76,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: JSON
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.8
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -119,8 +119,6 @@ files:
 - bin/noc
 - lib/noc/version.rb
 - lib/noc.rb
-- templates/Vagrantfile.erb
-- templates/knife.rb.erb
 - README.rdoc
 - noc.rdoc
 homepage: http://your.website.com

data/templates/Vagrantfile.erb

@@ -1,109 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-
-# header
-clusterfile = "<%= clusterfile %>"
-begin
-  $cluster = YAML.load_file clusterfile
-rescue Exception => e
-  STDERR.puts e.message
-  STDERR.puts "ERROR: Clusterfile not found: #{clusterfile}"
-  exit(-1)
-end
-
-
-# vagrant
-Vagrant::Config.run do |config|
-
-  vm_defaults = proc do |cfg|
-    $cluster[:defaults][:vm].each do |k,v|
-      eval("cfg.vm.#{k} = \"#{v}\"")
-    end
-
-    $cluster[:defaults][:modifyvm].each do |k,v|
-      cfg.vm.customize ["modifyvm", :id, "--#{k}", "#{v}"]
-    end
-  end
-
-  # cluster
-  $cluster[:nodes].each do |node,opts|
-    puts "Load cluster node: #{node}"
-    config.vm.define node.to_s do |cfg|
-      vm_defaults[cfg]
-      # cpu and memory
-      if not opts[:cpus].nil? then 
-        cfg.vm.customize ["modifyvm", :id, "--cpus", opts[:cpus]]
-      end
-      if not opts[:memory].nil? then 
-        cfg.vm.customize ["modifyvm", :id, "--memory", opts[:memory]]
-      end
-
-      cfg.vm.host_name = node.to_s
-
-      # networking
-      if not opts[:hostonly].nil? then
-        cfg.vm.network :hostonly, opts[:hostonly]
-      end
-      if not opts[:bridged].nil? then
-        cfg.vm.network :bridged, opts[:bridged]
-      end
-
-      # forwarding
-      if not opts[:forward].nil? then
-        opts[:forward].each { |p| cfg.vm.forward_port p[0], p[1]}
-      end
-
-      if opts[:chef_client] then
-        orgname = $cluster[:knife][:node_name]
-
-        cfg.vm.provision :chef_client do |chef|
-          if $cluster[:knife][:server_url].nil? then
-            chef.chef_server_url = "https://api.opscode.com/organizations/#{orgname}"
-          else
-            chef.chef_server_url = $cluster[:knife][:server_url]
-          end
-
-          if $cluster[:knife][:client_name].nil? then
-            chef.validation_client_name = "#{orgname}-validator"
-            chef.validation_key_path = ".chef/#{orgname}-validator.pem"
-          else
-            chef.validation_client_name = $cluster[:knife][:client_name]
-            chef.validation_key_path = ".chef/#{$cluster[:knife][:client_name]}.pem"
-          end
-
-          chef.encrypted_data_bag_secret_key_path = ".chef/data_bag.key"
-          chef.node_name = node.to_s
-
-          if not $cluster[:knife][:log_level].nil? then
-            chef.log_level = $cluster[:knife][:log_level]
-          end
-          chef.environment = opts[:chef_client]
-
-          if not opts[:roles].nil? then 
-            chef.run_list = opts[:roles]
-          end
-        end # :chef_client
-      else
-        cfg.vm.provision :chef_solo do |chef|
-          chef.cookbooks_path = opts[:cookbooks_path].nil? ? "cookbooks" : opts[:cookbooks_path]
-
-          chef.log_level = :debug
-
-          if not opts[:roles].nil? then 
-            chef.run_list = opts[:roles]
-          end
-
-          # access from chef node[:]
-          chef.json = {
-            :cluster => $cluster,
-            :host => opts,
-            "chef_server" => opts[:chef_server]
-          }
-        end
-      end # :chef_solo
-
-    end # cfg
-  end # nodes
-
-end

data/templates/knife.rb.erb

@@ -1,12 +0,0 @@
-current_dir = File.dirname(__FILE__)
-log_level                :info
-log_location             STDOUT
-node_name                "<%= if not defined? node_name then 'localhost' else node_name end %>"
-client_key               "#{current_dir}/<%= if not defined? node_name then 'localhost' else node_name end %>.pem"
-validation_client_name   "<%= if not defined? client_name then 'localhost' else client_name end %>"
-validation_key           "#{current_dir}/<%= if not defined? client_name then 'localhost' else client_name end %>.pem"
-chef_server_url          "<%= if not defined? server_url then 'http://localhost:4000' else server_url end %>"
-cache_type               'BasicFile'
-cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
-cookbook_path            ["#{current_dir}/../cookbooks"]
-encrypted_data_bag_secret "#{current_dir}/data_bag.key"