classify_cluster 0.4.10 → 0.4.11

data/bin/classify

@@ -1,36 +1,20 @@
 #!/usr/bin/env ruby
 
-require "classify_cluster"
-require "classify_cluster/version"
-require "commander/import"
+require 'rubygems'
+require 'thor'
+require File.join(File.dirname(__FILE__), '..', 'lib', "classify_cluster")
 require 'yaml'
 
-program :name, "Classify Cluster"
-program :version, ClassifyCluster::VERSION
-program :description, 'Generates configurations for different aspects of the cluster based off of one configuration.'
-default_command :puppet
-
-command :puppet do |c|
-  c.syntax = 'classify puppet <clustername> [options]'
-  c.description = 'Returns on STDOUT YAML dump of the clusters puppet config'
-  c.option '--config STRING', String, 'Location to config file.'
-  c.option '--export STRING', String, 'Location to output puppet cluster config'
-  c.action do |args, options|
-    options.default :config => ClassifyCluster::Base.default_config_file, :export => ENV['HOME']
-    ClassifyCluster::Writers::Puppet.export!(options.export, :cluster => args[0], :config_file => options.config)
+class Classify < Thor
+  default_task :puppet
+  
+  desc 'puppet CLUSTER_NAME', 'Generates configurations for different aspects of the cluster based off of one configuration.'
+  method_option :config, :desc => 'Location to config file', :type => :string, :default => ClassifyCluster::Base.default_config_file
+  method_option :export, :desc => 'Location to output puppet cluster config', :type => :string, :default => ENV['HOME']
+  def puppet(cluster_name=nil)
+    ClassifyCluster::Writers::Puppet.export!(options.export, :cluster => cluster_name, :config_file => options.config)
     say("Success!")
   end
 end
 
-command :config do |c|
-  c.syntax = 'classify config <clustername> [options]'
-  c.description = 'Runs an interactive script to generate a cluster configuration'
-  c.option '--export STRING', String, 'Location to output cluster configuration'
-  c.option '--cluster STRING', String, 'Cluster being created'
-  c.option '--defaults STRING', String, 'Location to load cluster defaults'
-  c.option '--variables STRING', String, 'Location to load cluster variables'
-  c.action do |args, options|
-    options.default :export => ClassifyCluster::Base.default_config_file, :defaults => '', :variables => ''
-    ClassifyCluster::Writers::Classify.export!(ClassifyCluster::Readers::Cli.start!(options.cluster, options.defaults, options.variables))
-  end
-end
+Classify.start(ARGV, :shell => Thor::Shell::Basic.new)

data/classify_cluster.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.homepage    = "http://rubygems.org/gems/classify_cluster"
   s.summary     = %q{Contains several binaries for generating capistrano and puppet configurations}
   s.description = %q{Reading from a YAML file will allow for consistent configuration between capistrano and puppet}
-  s.add_dependency(%q<commander>, ["~> 4.0.3"])
-  s.add_dependency(%q<highline>, [">= 1.5.0"])
-  s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+  s.add_dependency(%q<thor>, ["~> 0.14.6"])
+  s.add_dependency(%q<i18n>, [">= 0"])
+  s.add_dependency(%q<activesupport>, [">= 3.0.0"])
 
   s.rubyforge_project = "classify_cluster"
 

data/lib/classify_cluster/readers.rb

@@ -1 +0,0 @@
-require 'classify_cluster/readers/cli'

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

data/lib/classify_cluster/writers.rb

@@ -1,3 +1,2 @@
 require 'classify_cluster/writers/capistrano'
-require 'classify_cluster/writers/puppet'
-require 'classify_cluster/writers/classify'
+require 'classify_cluster/writers/puppet'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classify_cluster
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Sean Cashin
@@ -19,23 +19,23 @@ date: 2011-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: commander
+  name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 43
         segments: 
-        - 4
         - 0
-        - 3
-        version: 4.0.3
+        - 14
+        - 6
+        version: 0.14.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +44,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +56,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 description: Reading from a YAML file will allow for consistent configuration between capistrano and puppet
@@ -95,11 +93,9 @@ files:
 - lib/classify_cluster/configurator/resource.rb
 - lib/classify_cluster/configurator/role.rb
 - lib/classify_cluster/readers.rb
-- lib/classify_cluster/readers/cli.rb
 - lib/classify_cluster/version.rb
 - lib/classify_cluster/writers.rb
 - lib/classify_cluster/writers/capistrano.rb
-- lib/classify_cluster/writers/classify.rb
 - lib/classify_cluster/writers/puppet.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/classify_cluster

data/lib/classify_cluster/readers/cli.rb

@@ -1,114 +0,0 @@
-require 'highline/import'
-
-module ClassifyCluster
-  module Readers
-    class Cli
-      def self.start!(cluster_name, defaults_path='', variables_path='')
-        say("Welcome to classify cluster cli configurator!")
-        
-        defaults={}
-        variables={}
-        File.open(defaults_path, 'r') do |file|
-          defaults = eval(file.read)
-        end if File.exists?(defaults_path)
-        
-        File.open(variables_path, 'r') do |file|
-          variables = eval(file.read)
-        end if File.exists?(variables_path)
-        say "Configure cluster wide"
-        cluster_config = gather_cluster_info(cluster_name, defaults, variables)
-        say "Configure nodes"
-        nodes = []
-        ask("How many nodes: ", Integer).times do |i|
-          gather_node_info!(cluster_config)
-        end
-        puts cluster_config.inspect
-        cluster_config
-      end
-      
-      def self.gather_value(key, value, indent=0)
-        case value
-        when Array
-          answers = []
-          ask("#{"\t"*indent}How many #{key.to_s}: ", Integer).times do |i|
-            answers << gather_value(key, value.first, 1)
-            say "Configured #{i+1} #{key.to_s}"
-          end
-          answers
-        when Hash
-          ask("#{"\t"*indent}<%= @key %>: ", lambda {|ans| ans =~ /^\{\s*['|:].+$/ ? eval(ans) : ans}) do |q|
-            q.gather = value
-          end
-        when Integer
-          ask("#{"\t"*indent}#{key.to_s}: ", Integer)
-        else
-          ask("#{"\t"*indent}#{key.to_s}: ")
-        end
-      end
-      
-      def self.gather_node_info!(cluster_config)
-        hostname = ask("Hostname: ")
-        ip = ask("Ip: ")
-        role_names = ClassifyCluster::Configurator::ROLES.map { |k| k.is_a?(Hash) ? k.keys.first : k }
-        
-        cluster_config.node(hostname, ip) do |node|
-          more_roles = true
-          while more_roles
-            types = {}
-            role_name = ask("Role [#{role_names.join(', ')}]: ", role_names)
-            if ClassifyCluster::Configurator::ROLES.reject { |k| !k.is_a?(Hash) }.map(&:keys).flatten.include?(role_name)
-              possible_types = ClassifyCluster::Configurator::ROLES.reject { |k| !k.is_a?(Hash) || !k.has_key?(role_name)}[0][role_name]
-              more_types = true
-              while more_types
-                type = ask("Type [#{possible_types.join(', ')}]: ", possible_types) 
-                possible_types -= [type]
-                types[type] = true
-                more_types = possible_types.size > 0 && agree("More types? ")
-              end
-            end
-            node.role role_name.to_sym, types do |role|
-              while agree("Role variables?")
-                name = ask("name: ")
-                value = ask("value: ")
-                role.variable name, value
-              end
-            end
-            role_names -= [role_name]
-            more_roles = role_names.size > 0 && agree("More roles? ")
-          end
-        end
-      end
-      
-      def self.gather_cluster_info(cluster_name, defaults={}, variables={})
-        cluster_name = ask("Cluster Name (no spaces): ") do |q|
-          q.validate = /^\w.*/
-        end unless cluster_name
-        
-        ClassifyCluster::Configurator::Cluster.new(cluster_name) do |cluster_config|
-          file_path = ask("Ssl pem path: ") do |q| 
-            q.validate{ |a| File.exists?(a) }
-            q.default = ClassifyCluster::Configurator::Cluster::SSLPEM_FILEPATH
-          end
-          module_name = ask("Puppet module to move it to: ") do |q| 
-            q.default = ClassifyCluster::Configurator::Cluster::SSLPEM_MODULE
-          end
-          cluster_config.ssl_pem(file_path, module_name)
-          
-          defaults.each_pair do |key, value|
-            cluster_config.variable key, value
-          end
-          variables.each_pair do |key, value|
-            cluster_config.variable key, gather_value(key, value)
-          end
-          
-          klasses = ask("Classes: (q to stop)") do |q|
-            q.gather = 'q'
-          end
-          klasses.delete_if {|klass| klass.nil? || klass.empty?}.each do |klass|
-            cluster_config.klass klass
-          end
-        end
-      end
-    end
-  end
-end

data/lib/classify_cluster/writers/classify.rb

@@ -1,25 +0,0 @@
-module ClassifyCluster
-  module Writers
-    class Classify
-      def self.export!(classify_configurator)
-        File.open('/etc/cluster.rb', 'w') do |file|
-          output file, "# Autogenerated on #{Time.now.to_s}"
-          output file, "cluster :\"#{classify_configurator.name}\" do |cluster|"
-
-          classify_configurator.classes.each do |klass|
-            output file, "cluster.klass #{klass.inspect}", 1
-          end
-          classify_configurator.variables.each_pair do |key, variable|
-            output file, "cluster.variable #{key.inspect}, #{variable.inspect}", 1
-          end
-
-          output file, "end"
-        end
-      end
-      
-      def self.output(file, str, indent=0)
-        file.write("#{"\s"*(indent*4)}#{str}\n")
-      end
-    end
-  end
-end