nuri 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5713187406a70381abeffa8e382892172e1cab3a
-  data.tar.gz: 589c3291070bf16e6ee05e4846192ae3d0ddca81
+  metadata.gz: 52435655f176b90c016bb5f1ae94348f03c480c7
+  data.tar.gz: 12e8e06d2689353bb6fd3dfe2b8047b709ba8d20
 SHA512:
-  metadata.gz: 5917ac035100aeb2e1dc75ff326034d9bbc7b5ef8a8679307581d389cca20dc8b9138bafddcdddccfbe9e6457184418eaa1ffb42ea6ddfd6c5fed6d8d30b8728
-  data.tar.gz: d14d4cfd96af587cdf02a4f622e1ad7773db83052eef68de3e304f1196313814aca4e0673d3069d721f662fba89db8158bef6a91b1b2f09eeb3e0ee13248c01a
+  metadata.gz: fbe8ac30498b9f0c672dcf429d6c7a5e7178e00a24c50c725cd95d1472d06d570e0a35121913d266c112b797c4af141ad16b2bd0870c7899006484102093dadf
+  data.tar.gz: da39e1869ccf6eae68622497fe2f99c6143079dc57aa8675a6a6ebc2584f28c51d4477587e86359273c8c763537657bc4bf3c32c4dd0220e52ed6b0c9a5c9684

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - jruby-19mode
 
 notifications:
   - email: false

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/bin/nuri

@@ -8,11 +8,6 @@ About = "Nuri #{Version} (c) 2013"
 
 Nuri.init
 
-def console(*args)
-	print Time.now.strftime('%Y-%m-%d %H:%M:%S '.yellow)
-	$stdout.puts(args)
-end
-
 class Nuri::Console
 	include Nuri::Helper
 
@@ -37,7 +32,7 @@ where [options] are:
 EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
 			opt :json, 'print output in JSON'
-			opt :plain, 'print output in plain text'
+			opt :color, 'enable colorized output'
 			opt :no_push_module, 'disable automatic push module'
 		end
 		help, args = check_help(args)
@@ -54,9 +49,10 @@ EOS
 			state.accept(Sfp::Helper::Sfp2Ruby)
 
 			if opts[:json]
-				puts (opts[:plain] ? JSON.generate(state) : CodeRay.encode(JSON.pretty_generate(state), :json, :terminal))
+				puts (!opts[:color] ? JSON.generate(state) : CodeRay.encode(JSON.pretty_generate(state), :json, :terminal))
 			else
-				puts (opts[:plain] ? YAML.dump(state) : CodeRay.encode(YAML.dump(state), :yaml, :terminal))
+				puts (!opts[:color] ? YAML.dump(state) : CodeRay.encode(YAML.dump(state), :yaml, :terminal))
+
 			end
 		else
 			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details.".red
@@ -73,7 +69,8 @@ EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
 			opt :parallel, 'generate a parallel plan', :short => '-l'
 			opt :apply, 'generate and execute a plan', :short => '-a'
-			opt :plain, 'print output in plain JSON'
+			opt :json, 'print the plan in JSON'
+			opt :color, 'enable colorized output'
 			opt :no_interactive, 'disable interactive input'
 			opt :no_push_module, 'disable automatic push module'
 			opt :image, 'image graph of the generated plan', :default => Dir.home + '/.nuri/plan.png'
@@ -83,6 +80,7 @@ EOS
 	
 		if help
 			parser.educate(STDOUT)
+
 		elsif File.exist?(opts[:model_file])
 			opts[:plan] = true
 			opts[:push_modules] = true if !opts[:no_push_module]
@@ -95,22 +93,25 @@ EOS
 					File.open(plan_file, 'w') { |f| f.write(JSON.generate(plan)) }
 
 					if opts[:image]
-						system "#{File.dirname(__FILE__)}/sfw2graph #{plan_file} #{opts[:image]}"
+						system "#{File.dirname(__FILE__)}/nuri-sfwgraph #{plan_file} #{opts[:image]}"
 					end
 
-					if opts[:plain]
-						puts JSON.generate(plan)
+					if opts[:json]
+						json = JSON.pretty_generate(plan)
+						puts (opts[:color] ? CodeRay.encode(json, :json, :terminal) : json)
+
 					else
 						actions = plan['workflow']
 						if plan['type'] == 'sequential'
-							p = 'Sequential Plan:'.yellow
+							p = 'Sequential Plan:'
 							actions.each_index { |i| p += "\n#{i+1}. #{actions[i]['name']} #{JSON.generate(actions[i]['parameters'])}" }
 							puts p
 						else
-							p = 'Partial-Order Plan:'.yellow
+							p = 'Partial-Order Plan:'
 							actions.each { |op| p += "\n#{op['id']+1}. #{op['name']} #{JSON.generate(op['parameters'])} (#{op['predecessors'].map{|i|i+1}}, #{op['successors'].map{|i|i+1}})" }
 							puts p
 						end
+
 					end
 
 					if not opts[:apply] and not opts[:no_interactive]
@@ -119,23 +120,23 @@ EOS
 					end
 
 					if opts[:apply]
-						puts 'Executing the plan: '.yellow
+						puts 'Executing the plan:'
 						opts[:plan] = plan
 						if master.execute_plan(opts)
-							puts "Execution success!".green
+							puts (opts[:color] ? "Execution success.".green : "Execution success.")
 						else
-							puts "Execution failed!".red
+							puts (opts[:color] ? "Execution failed.".red : "Execution failed.")
 						end
 					end
 
 				elsif plan['workflow'].length == 0
-					puts (opts[:plain] ? 'Goal state has been achieved.' : 'Goal state has been achieved.').green
+					puts (opts[:color] ? "Goal state has been achieved.".green : "Goal state has been achieved.")
 				end
 			else
-				$stderr.puts (opts[:plain] ? "No solution!".yellow : "No solution!".red)
+				$stderr.puts (opts[:color] ? "No solution.".red : "No solution.")
 			end
 		else
-			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details.".red
+			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details."
 		end
 	end
 
@@ -148,7 +149,7 @@ EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
 			opt :purge, 'purge existing BSig model', :short => '-g'
 			opt :deploy, 'generate and then deploy a BSig model'
-			opt :plain, 'print output in plain JSON'
+			opt :color, 'enable colorized output'
 			opt :no_interactive, 'disable interactive input'
 		end
 		help, args = check_help(args)
@@ -163,21 +164,20 @@ EOS
 			master.set_model(opts)
 	
 			if opts[:purge]
+				print "Purging Behavioural Signature model "
 				if master.purge_bsig(opts)
-					puts "Purging Behavioural Signature model [OK]".green
+					puts (opts[:color] ? "[OK]".green : "[OK]")
 				else
-					puts "Purging Behavioural Signature model [Failed]".red
+					puts (opts[:color] ? "[Failed]".red : "[Failed]")
 				end
+
 			else
 				bsig = master.get_bsig(opts)
 				if bsig.is_a?(Hash) and bsig.length > 0
 					empty_local_bsig = bsig.select { |name,local_bsig| local_bsig['operators'].length <= 0 }
 					if empty_local_bsig.length != bsig.length
-						if opts[:plain]
-							puts JSON.generate(bsig)
-						else
-							puts CodeRay.encode(JSON.pretty_generate(bsig), :json, :terminal)
-						end
+						json = JSON.pretty_generate(bsig)
+						puts (opts[:color] ? CodeRay.encode(json, :json, :terminal) : json)
 		
 						if not opts[:no_interactive] and not opts[:deploy]
 							print "Deploy the BSig model [y/N]? "
@@ -185,23 +185,23 @@ EOS
 						end
 	
 						if opts[:deploy]
-							puts 'Deploying the BSig model: '.yellow
+							print 'Deploying the BSig model '
 							opts[:bsig] = bsig
 							if master.deploy_bsig(opts)
-								puts "Deployment success!".green
+								puts (opts[:color] ? "[OK]".green : "[OK]")
 							else
-								puts "Deployment failed!".red
+								puts (opts[:color] ? "[Failed]".red : "[Failed]")
 							end
 						end
 					else
-						puts (opts[:plain] ? 'Goal state has been achieved.' : 'Goal state has been achieved.').green
+						puts (opts[:color] ? "Goal state has been achieved.".green : "Goal state has been achieved.")
 					end
 				else
-					$stderr.puts (opts[:plain] ? "No solution!".yellow : "No solution!".red)
+					$stderr.puts (opts[:color] ? "No solution.".red : "No solution.")
 				end
 			end
 		else
-			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details.".red
+			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details."
 		end
 	end
 
@@ -216,13 +216,15 @@ where <subcommand> is:
        restart     restart the agent (use SSH for remode node)
           stop     stop the agent (use SSH for remote node)
         status     get status (use SSH for remote node)
+         reset     delete all modules, model (desired state), bsig-model,
+                    and agents list
          state     get current state
          model     get current model
           bsig     get current Behavioural Signature model
  exec <action>     execute given action description
                     <action> := <path> [param1=value1 param2=value2 ...]
         module     get modules list
-           log     get last 100 lines of logs
+           log     get last 100 lines of agent's logs file
           list     list of available agents from model file
   
 where [options] are:
@@ -233,6 +235,7 @@ EOS
 			opt :ssh_user, "SSH username", :short => '-u', :default => 'root'
 			opt :ssh_port, "SSH port", :short => '-p', :default => '22'
 			opt :raw, "print a RAW output"
+			opt :color, "enable colorized output"
 		end
 		help, args = check_help(args)
 		subcommand = (args.length > 0 ? args.shift : '')
@@ -248,26 +251,26 @@ EOS
 			parser.educate(STDOUT)
 		elsif `which sfpagent`.strip.length > 0 or ssh_opt.length > 0
 			case subcommand
-			when 'install'
+			when 'i', 'install'
 				system("#{ssh_opt} sudo gem install sfpagent --no-ri --no-rdoc")
 
-			when 'start'
+			when 's', 'start'
 				system "#{ssh_opt} sfpagent -s && sleep 5"
 				system "#{ssh_opt} sfpagent -a"
 
-			when 'restart'
+			when 'r', 'restart'
 				system "#{ssh_opt} sfpagent -r"
 
-			when 'stop'
+			when 't', 'stop'
 				system("#{ssh_opt} sfpagent -t")
 
-			when 'status'
+			when 'a', 'status'
 				system("#{ssh_opt} sfpagent -a")
 
 			when 'upgrade'
 				system("#{ssh_opt} sudo gem update sfpagent --no-ri --no-rdoc")
 
-			when 'state'
+			when 'e', 'state'
 				code, state = get_data(opts[:address], 1314, "/state")
 				if code == '200' and state =~ /{.*}/
 					state = JSON[state]['state']
@@ -275,47 +278,51 @@ EOS
 						state.keys.each { |key| state.delete(key) if state[key]['_context'] != 'object' }
 						state.accept(Sfp::Helper::Sfp2Ruby)
 					end
-					puts CodeRay.encode(YAML.dump(state), :yaml, :terminal)
+					puts (opts[:color] ? CodeRay.encode(YAML.dump(state), :yaml, :terminal) : YAML.dump(state))
+
 				else
 					puts state
+
 				end
 
-			when 'model'
+			when 'm', 'model'
 				code, model = get_data(opts[:address], 1314, "/model")
-				if code == '200' and model =~ /{.*}/
+				if code == '200' and model =~ /{.+}/
 					model = JSON[model]
 					if not opts[:raw]
 						model.select! { |k,v| k[0,1] != '_' and (not v.is_a?(Hash) or v['_context'] == 'object') }
 						model.accept(Sfp::Helper::Sfp2Ruby)
 					end
-					puts CodeRay.encode(YAML.dump(model), :yaml, :terminal)
-				elsif code == '404'
-					puts "The model of desired state is not exist!"
+					puts (opts[:color] ? CodeRay.encode(YAML.dump(model), :yaml, :terminal) : YAML.dump(model))
+				elsif code == '404' or model == '{}'
+					puts "Model of desired state is not exist."
 				else
 					$stderr.puts "Error: #{code}"
 				end
 
-			when 'bsig'
-				code, json = get_data(opts[:address], 1314, "/bsig")
-				if code == '200' and json.length > 0
-					puts CodeRay.encode(JSON.pretty_generate(JSON[json]), :json, :terminal)
-				elsif code == '404'
-					puts 'Behavioural Signature model is not exist!'
+			when 'b', 'bsig'
+				code, bsig = get_data(opts[:address], 1314, "/bsig")
+				if code == '200' and bsig =~ /{.+}/
+					json = JSON.pretty_generate(JSON[json])
+					puts (opts[:color] ? CodeRay.encode(json, :json, :terminal) : json)
+				elsif code == '404' or bsig == '{}'
+					puts 'Behavioural Signature model is not exist.'
 				else
 					$stderr.puts "Error: #{code}"
 				end
 
-			when 'module'
-				code, json = get_data(opts[:address], 1314, "/modules")
-				if code == '200' and json.length >= 2
-					puts CodeRay.encode(YAML.dump(JSON[json]), :yaml, :terminal)
-				elsif code == '404'
-					puts 'No module is available!'
+			when 'mod', 'module', 'modules'
+				code, modules = get_data(opts[:address], 1314, "/modules")
+				if code == '200' and modules =~ /{.+}/
+					output = YAML.dump(JSON[modules])
+					puts (opts[:color] ? CodeRay.encode(output, :yaml, :terminal) : output)
+				elsif code == '404' or modules == '{}'
+					puts 'No module is available.'
 				else
 					$stderr.puts "Error: #{code}"
 				end
 
-			when 'exec', 'execute'
+			when 'x', 'exec', 'execute'
 				if args.length > 0
 					name = args.shift
 					name = '$.' + name if !name.isref
@@ -328,25 +335,44 @@ EOS
 					end
 					data = { 'action' => JSON.generate({ 'name' => name, 'parameters' => parameters }) }
 					code, _ = post_data(opts[:address], 1314, "/execute", data)
-					puts (code == '200' ? "Executing #{name} [OK]".green : "Executing #{name} [Failed]".red)
+					if opts[:color]
+						puts (code == '200' ? "Executing #{name} [OK]".green : "Executing #{name} [Failed]".red)
+					else
+						puts (code == '200' ? "Executing #{name} [OK]" : "Executing #{name} [Failed]")
+					end
 				else
 					$stderr.puts 'Invalid parameters (usage: agent exec <action-path> [action-arguments]).'
 				end
 
-			when 'log'
+			when 'g', 'log', 'logs'
 				puts Net::HTTP.get "#{opts[:address]}", "/log", 1314
 
-			when 'list'
+			when 'l', 'list'
 				get_agents(opts).each { |name,model| puts "#{name} address=#{model['sfpAddress']} port=#{model['sfpPort']}" }
 
-			when 'help'
+			when 'reset'
+				codes = []
+				codes[0], _ = delete_data(opts[:address], 1314, "/bsig")
+				codes[1], _ = delete_data(opts[:address], 1314, "/model/cache")
+				codes[2], _ = delete_data(opts[:address], 1314, "/model")
+				codes[3], _ = delete_data(opts[:address], 1314, "/modules")
+				codes[4], _ = delete_data(opts[:address], 1314, "/agents")
+
+				failed = codes.index { |x| x != '200' }
+				if opts[:color]
+					puts (failed ? "Reset agent [Failed]".red : "Reset agent [OK]".green)
+				else
+					puts (failed ? "Reset agent [Failed]" : "Reset agent [OK]")
+				end
+
+			when 'h', 'help'
 				parser.educate(STDOUT)
 
 			else
-				$stderr.puts 'Unrecognized command! Use \"-h\" to print available commands.'.red
+				$stderr.puts 'Unrecognized command! Use -h to print available commands.'
 			end
 		else
-			$stderr.puts 'sfpagent gem is not installed!'.red
+			$stderr.puts 'sfpagent gem is not installed!'
 		end
 	end
 
@@ -382,7 +408,8 @@ EOS
 	end
 
 	def do_console
-		banner = <<-EOS
+		parser = Trollop::Parser.new do
+			banner <<-EOS
 Usage: <command> [options]
 when <command> is:
   state     get current state
@@ -394,12 +421,13 @@ when <command> is:
    exit     exit this console
 
 EOS
+		end
 
 		username = `whoami`.strip
 		puts About
 		loop do
 			begin
-				print "nuri@#{username}> ".green
+				print "nuri@#{username}> ".cyan
 				begin
 					input = STDIN.gets
 					raise Exception if input.nil?
@@ -434,13 +462,13 @@ EOS
 					when 'pwd'
 						puts Dir.pwd
 					when 'ls'
-						system "ls --color #{args.join(" ")}"
+						system "ls #{args.join(" ")}"
 					when 'help'
-						puts banner
+						parser.educate(STDOUT)
 					when 'version', '-v'
 						puts About
 					else
-						$stderr.puts 'Unrecognized command! Use \"-h\" option to print available commands.'.red
+						$stderr.puts 'Unrecognized command! Use -h option to print available commands.'
 					end
 				end
 			rescue Exception => e
@@ -458,7 +486,7 @@ where [options] are:
 EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
 			opt :json, 'print output in JSON'
-			opt :plain, 'print output in plain format'
+			opt :color, 'enable colorized output'
 		end
 		help, args = check_help(args)
 		opts = process_args args, parser
@@ -475,13 +503,13 @@ EOS
 			model.accept(Sfp::Helper::Sfp2Ruby)
 
 			if opts[:json]
-				puts (opts[:plain] ? JSON.generate(model) : CodeRay.encode(JSON.pretty_generate(model), :json, :terminal))
+				puts (!opts[:color] ? JSON.generate(model) : CodeRay.encode(JSON.pretty_generate(model), :json, :terminal))
 			else
-				puts (opts[:plain] ? YAML.dump(model) : CodeRay.encode(YAML.dump(model), :yaml, :terminal))
+				puts (!opts[:color] ? YAML.dump(model) : CodeRay.encode(YAML.dump(model), :yaml, :terminal))
 			end
 
 		else
-			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details.".red
+			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details."
 
 		end
 	
@@ -503,19 +531,19 @@ EOS
 		if ARGV.length > 0
 			success = false
 			case ARGV.shift
-			when 'state'
+			when 's', 'state'
 				do_state
-			when 'plan'
+			when 'p', 'plan'
 				do_plan
-			when 'bsig'
+			when 'b', 'bsig'
 				do_bsig
-			when 'agent'
+			when 'a', 'agent'
 				do_agent
-			when 'console'
+			when 'c', 'console'
 				do_console
-			when 'edit'
+			when 'e', 'edit'
 				do_edit
-			when 'model'
+			when 'm', 'model'
 				do_model
 			else
 				puts banner