nuri 0.5.2 → 0.5.3

data/modules/pyfile/pyfile.sfp

@@ -0,0 +1,23 @@
+schema pyfile {
+	created : Bool
+	final path = ""
+	final content : String
+
+	sub del {
+		condition {
+			this.created = true
+		}
+		effect {
+			this.created = false
+		}
+	}
+
+	sub create {
+		condition {
+			this.created != true
+		}
+		effect {
+			this.created = true
+		}
+	}
+}

data/modules/service2/service2.rb

@@ -0,0 +1,62 @@
+class Sfp::Module::Service2
+	include Sfp::Resource
+
+	def update_state
+		to_model
+
+		@state['running'] = running?
+	end
+
+	##############################
+	#
+	# Action methods (see service2.sfp)
+	#
+	##############################
+
+	def start(p={})
+		return true if running?
+
+		if @model['name'].to_s.strip.length > 0
+			shell "sudo service #{@model['name']} start"
+		elsif @model['script'].to_s.strip.length > 0
+			shell "sudo #{@model['script']} start"
+		else
+			return false
+		end
+		sleep 1
+		running?
+	end
+
+	def stop(p={})
+		return true if not running?
+
+		if @model['name'].to_s.strip.length > 0
+			shell "sudo service #{@model['name']} stop"
+		elsif @model['script'].to_s.strip.length > 0
+			shell "sudo #{@model['script']} stop"
+		else
+			return false
+		end
+		sleep 1
+		not running?
+	end
+
+
+	##############################
+	#
+	# Helper methods
+	#
+	##############################
+
+	def running?
+		output = nil
+		if @model['name'].to_s.strip.length > 0
+			output = `service #{@model['name']} status 2>/dev/null`.to_s.downcase
+		elsif @model['script'].to_s.strip.length > 0
+			output = `#{@model['script']} status 2>/dev/null`.to_s.downcase
+		else
+			return false
+		end
+		return !!(output =~ /is running/ or output =~ /start\/running/ or output =~ /uptime/)
+	end
+end

data/modules/service2/service2.sfp

@@ -0,0 +1,24 @@
+schema Service2 {
+	running : Bool
+
+	final name = ""
+	final script = ""
+
+	sub start {
+		condition {
+			this.running != true
+		}
+		effect {
+			this.running = true
+		}
+	}
+
+	sub stop {
+		condition {
+			this.running = true
+		}
+		effect {
+			this.running = false
+		}
+	}
+}

data/nuri.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 	s.homepage              = 'https://github.com/herry13/nuri'
 	s.rubyforge_project     = 'nuri'
 
-	s.add_dependency 'sfplanner', '~> 0.1'
+	s.add_dependency 'sfplanner', '~> 0.2.1'
 	s.add_dependency 'sfpagent', '~> 0.3'
 	s.add_dependency 'colorize', '~> 0.6'
 	s.add_dependency 'coderay', '~> 1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuri
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfplanner
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: sfpagent
   requirement: !ruby/object:Gem::Requirement
@@ -95,12 +95,11 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/delete_modules
 - bin/install_agent
-- bin/install_module
 - bin/nuri
-- bin/nuri.old
-- bin/sfw2graph
+- bin/nuri-install-module
+- bin/nuri-sfwgraph
+- bin/nuri-uninstall-module
 - examples/.gitignore
 - examples/bonfire.sfp
 - examples/bonfire/epcc.sfp
@@ -160,6 +159,8 @@ files:
 - examples/hadoop2.sfp
 - examples/hpcloud.sfp
 - examples/mockcloud/generator.rb
+- examples/mockcloud/generator.rb.bak
+- examples/mockcloud/hadoop2.sfp.template
 - examples/mockcloud/run.rb
 - examples/test.inc
 - examples/test.sfp
@@ -189,6 +190,8 @@ files:
 - modules/apache/load_balancer
 - modules/apache/model.json
 - modules/apache/test.sfp
+- modules/apache2/apache2.rb
+- modules/apache2/apache2.sfp
 - modules/aptpackage/aptpackage.rb
 - modules/aptpackage/aptpackage.sfp
 - modules/bonfire/.gitignore
@@ -227,7 +230,6 @@ files:
 - modules/hpcloud/hpcloud.rb
 - modules/hpcloud/hpcloud.sfp
 - modules/hpcloud/test.sfp
-- modules/install_module
 - modules/machine/machine.rb
 - modules/machine/machine.sfp
 - modules/mockcloud/mockcloud.rb
@@ -244,10 +246,14 @@ files:
 - modules/package/package.rb
 - modules/package/package.sfp
 - modules/package/test.sfp
-- modules/service/model.json
+- modules/package2/package2.rb
+- modules/package2/package2.sfp
+- modules/pyfile/main
+- modules/pyfile/pyfile.sfp
 - modules/service/service.rb
 - modules/service/service.sfp
-- modules/service/test.sfp
+- modules/service2/service2.rb
+- modules/service2/service2.sfp
 - modules/tarpackage/tarpackage.rb
 - modules/tarpackage/tarpackage.sfp
 - modules/vm/vm.rb

data/bin/delete_modules

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'uri'
-require 'net/http'
-
-module Nuri
-	module Util
-		def self.delete_modules(address, port, protocol="http")
-			url = "#{protocol}://#{address}:#{port}/modules"
-			uri = URI.parse(url)
-			http = Net::HTTP.new(uri.host, uri.port)
-			request = Net::HTTP::Delete.new(uri.request_uri)
-			response = http.request(request)
-			(response.code == '200')
-		end
-	end
-end
-
-if $0 == __FILE__
-	DefaultPort = 1314
-
-	if ARGV.length < 1
-		puts "Usage: delete_modules <address> [port]"
-		exit(1)
-	end
-
-	address = ARGV.shift
-	port = (ARGV[0].nil? ? DefaultPort : ARGV[0].to_i)
-
-	if Nuri::Util.delete_modules(address, port)
-		puts '{"status":"ok"}'
-	else
-		puts '{"status":"failed"}'
-	end
-end

data/bin/nuri.old

@@ -1,183 +0,0 @@
-#!/usr/bin/env ruby
-
-dir = File.expand_path(File.dirname(__FILE__)) + '/../lib'
-require "#{dir}/nuri"
-
-require 'coderay'
-require 'logger'
-
-version = File.read(File.dirname(__FILE__) + '/../VERSION').sub(/\n/, '')
-
-opts = Trollop::options do
-	version "Nuri #{version} (c) 2013"
-	banner <<-EOS
-Usage: nuri [options]
-where [options] are:
-EOS
-
-	opt :model_file, "Model of configuration file.", :default => '', :short => '-m'
-	opt :state, "Print the current state of the system in JSON based on given model file.", :short => '-s'
-	opt :plan, "Print the plan that could bring the system to the desired state as defined in model file.", :short => '-p'
-	opt :parallel, "Generate a parallel plan.", :short => '-l'
-	opt :bsig_deploy, "Generate and deploy Behavioural Signature model", :short => '-b'
-	opt :bsig_purge, "Purge Behavioural Signature model", :short => '-g'
-	opt :execute, "Execute a plan in given file. Note: model file should be specified.", :default => '', :short => '-x'
-	opt :apply, "Generate and execute a plan that could bring the system to the desired state.", :short => '-a'
-	opt :push_modules, "Automatically push an unavailable module to target agent.", :short => '-u'
-	opt :human, "Use human readable format.", :short => '-h'
-	opt :pretty, "Use pretty JSON format.", :short => '-r'
-	opt :silent, "Set off interactive mode.", :defaut => true, :short => '-n'
-	#opt :start, "Start master daemon.", :short => '-s'
-	#opt :stop, "Stop master daemon.", :short => '-t'
-end
-
-puts opts.inspect
-def plan_to_human(plan)
-	return 'No solution plan.'.red if plan['workflow'].nil?
-	return 'The system is at the goal state.'.green if plan['workflow'].length <= 0
-
-	p = ''
-	actions = plan['workflow']
-	if plan['type'] == 'sequential'
-		p = 'Sequential Plan:'.yellow
-		actions.each_index { |i| p += "\n#{i+1}. #{actions[i]['name']} #{JSON.generate(actions[i]['parameters'])}" }
-	else
-		p = 'Partial-Order Plan:'.yellow
-		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}})" }
-	end
-	p
-end
-
-def verify_model(opts)
-	if opts[:model_file].length <= 0
-		puts "Model file is not specified! Use \"-h\" option for more details.".red
-		exit(false)
-	end
-end
-
-if opts[:state]
-	verify_model(opts)
-
-	master = Nuri::Master.new
-	master.set_model(opts)
-	state = master.get_state(opts)
-	state.accept(Sfp::Visitor::PrettyStateGenerator.new)
-	if opts[:human]
-		puts CodeRay.encode(JSON.pretty_generate(state), :json, :terminal)
-	else
-		puts (opts[:pretty] ? JSON.pretty_generate(state) : JSON.generate(state))
-	end
-
-elsif opts[:plan]
-	verify_model(opts)
-
-	master = Nuri::Master.new
-	master.set_model(opts)
-	plan = master.get_plan(opts)
-	if !plan.is_a?(Hash) or plan['workflow'].nil?
-		puts "Plan: ".yellow + "\nno solution!".red
-	else
-		if opts[:human]
-			puts plan_to_human(plan)
-		else
-			puts (opts[:pretty] ? JSON.pretty_generate(plan) : JSON.generate(plan))
-		end
-
-		if not opts[:silent] and plan['workflow'].is_a?(Array) and plan['workflow'].length > 0
-			print "Execute the plan [y/N]? "
-			if STDIN.gets.chomp.upcase == 'Y'
-				puts 'Executing the plan:'.yellow
-				opts[:plan] = plan
-				puts (master.execute_plan(opts) ? "Execution success!".green : "Execution failed!".red)
-			end
-		end
-	end
-
-elsif opts[:execute].length > 0
-	verify_model(opts)
-
-	master = Nuri::Master.new
-	master.set_model(opts)
-	puts (master.execute_plan(opts) ? "Execution success!".green : "Execution failed!".red)
-
-elsif opts[:apply]
-	verify_model(opts)
-
-	master = Nuri::Master.new
-	master.set_model(opts)
-	plan = master.get_plan(opts)
-	if not plan.is_a?(Hash)
-		puts "No solution!".red
-	else
-		if opts[:human]
-			puts plan_to_human(plan)
-		else
-			puts (opts[:pretty] ? JSON.pretty_generate(plan) : JSON.generate(plan))
-		end
-
-		if plan['workflow'].is_a?(Array) and plan['workflow'].length > 0
-			puts 'Executing the plan...'.yellow
-			opts[:plan] = plan
-			puts (master.execute_plan(opts) ? "Execution success!".green : "Execution failed!".red)
-		end
-	end
-
-elsif opts[:bsig_deploy]
-	verify_model(opts)
-	opts[:parallel] = true
-
-	master = Nuri::Master.new
-	master.set_model(opts)
-	bsig = master.get_bsig(opts)
-
-	if not bsig.is_a?(Hash)
-		puts "\nNo solution!".red
-	elsif bsig.length > 0
-		empty_local_bsig = bsig.select { |name,local_bsig| local_bsig['operators'].length <= 0 }
-
-		if empty_local_bsig.length == bsig.length
-			puts "The goal state has been achieved!".green
-
-		else
-			# print the BSig model
-			if opts[:human]
-				puts CodeRay.encode(JSON.pretty_generate(bsig), :json, :terminal)
-			else
-				puts (opts[:pretty] ? JSON.pretty_generate(bsig) : JSON.generate(bsig))
-			end
-
-			if not opts[:silent]
-				print "Deploy the BSig model [y/N]? "
-				if STDIN.gets.chomp.upcase == 'Y'
-					puts 'Deploying the BSig model:'.yellow
-					opts[:bsig] = bsig
-					puts (master.deploy_bsig(opts) ? "Deployment success!".green : "Deployment failed!".red)
-				end
-			end
-
-		end
-	end
-
-elsif opts[:bsig_purge]
-	verify_model(opts)
-
-	puts "Purging Behavioural Signature model...".yellow
-	master = Nuri::Master.new
-	master.set_model(opts)
-	if master.purge_bsig(opts)
-		puts "Purging Behavioural Signature model [OK]".green
-	else
-		puts "Purging Behavioural Signature model [Failed]".red
-	end
-
-=begin
-elsif opts[:start]
-	puts "Not implemented yet!".red
-
-elsif opts[:stop]
-	puts "Not implemented yet!".red
-=end
-
-else
-	Trollop::help
-end

data/modules/install_module

@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'uri'
-require 'net/http'
-require File.dirname(__FILE__) + '/../lib/nuri/targz'
-
-module Nuri
-	module Util
-		TarGzip = Object.new.extend(Util::Tar)
-	
-		def self.install_modules(address, port, modules, protocol="http")
-			data = {}
-			modules.each do |module_name|
-				raise Exception, "Module #{module_name} is not exist!" if not ::File.directory?(module_name)
-				data[module_name] = TarGzip.targzip(module_name, module_name).read
-			end
-
-			url = "#{protocol}://#{address}:#{port}/modules"
-			uri = URI.parse(url)
-			http = Net::HTTP.new(uri.host, uri.port)
-			request = Net::HTTP::Put.new(uri.request_uri)
-			request.set_form_data(data)
-			response = http.request(request)
-
-			(response.code == '200')
-		end
-	end
-end
-
-if $0 == __FILE__
-	if ARGV.length < 2
-		puts "Usage: install_module <address> [port] <module-name> ..."
-		exit(1)
-	end
-
-	DefaultPort = 1314
-
-	address = ARGV.shift
-	port = (ARGV.length >= 2 ? ARGV.shift : DefaultPort)
-	modules = ARGV
-	missing = modules.select { |mod| not ::File.directory?(mod) }
-	modules = modules - missing
-	
-	success = Nuri::Util.install_modules(address, port, modules),
-	output = {
-		:status => success,
-		:installed_modules => modules,
-		:missing_modules => missing
-	}
-	puts JSON.generate(output)
-
-	exit (success ? 0 : 1)
-end