nuri 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d540fda2ce76121b09511e85b2c986141462e3f
-  data.tar.gz: 36872856f912ad6cbd3998fac2721ac4c7713e8b
+  metadata.gz: 1c34076e1cbaeb3ab79b76e36387aa2511cab7ff
+  data.tar.gz: 727cd0fd4aeb6be246a700a1981818352e93f365
 SHA512:
-  metadata.gz: d5bf64d0730f0f802a28d0464e79905f0c9a1ed60a7e083d6276b93f3eae99a1016eac02a57ccd7f0ff65b4b9c47f92f3828b4379c8fec942c562af643c0cb61
-  data.tar.gz: c593d7e1a00db7e9e8c2e5c95b79e0573b849dcd3f8a6aea7343f34cf762db3de27d6a45c6cee78bd00e63905e8c3f0bcc0f8a57360965c9a70f7180cd3e5b49
+  metadata.gz: 978456225ec11b54c4bee8ba57043783b7763a24887901d372f7a16ad53e366c70a8af55bcddb51ebd0326540efa4dece7a27dff5222b6502f999a98d9dbeed4
+  data.tar.gz: 5f9a62df8ef5f9118806309d6a6247360149b0e306f663650693c5e5221bf70cdce181990e8f9ff4a6505ff9c5ec35736d5a8c2b2865b4853d04f9f5416f4ec3

data/README.md

@@ -35,15 +35,24 @@ Requirements
 	- colorize
 	- coderay
 
-Tested on Linux: **Ubuntu 12.04**, **Debian Squeeze**, and **Fedora 13**
+Tested on
+---------
+- Linux: **Ubuntu 12.04**, **Debian Squeeze**, and **Fedora 13**
+- MacOS X
 
 
 To install
 ----------
+- Installing the Gem:
 
-	$ apt-get install curl ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1 libxml2-dev libxslt-dev make gcc
-	$ gem install nuri
+		$ apt-get install ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1 libxml2-dev libxslt-dev make gcc
+		$ gem install nuri
 
+- Clone from Github:
+
+		$ apt-get install git ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1 libxml2-dev libxslt-dev make gcc
+		$ gem install sfplanner coderay colorize
+		$ git clone https://github.com/herry13/nuri
 
 Usage
 -----

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/bin/nuri

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-dir = File.expand_path('../../', __FILE__)
-require "#{dir}/lib/nuri"
+home = File.expand_path('../', File.dirname(__FILE__))
+require "#{home}/lib/nuri"
 
 Version = File.read(File.dirname(__FILE__) + "/../VERSION").strip
 About = "Nuri #{Version} (c) 2013"
@@ -76,7 +76,7 @@ EOS
 			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'
+			opt :image, 'image graph of the generated plan', :default => ''
 		end
 		help, args = check_help(args)
 		opts = process_args args, parser
@@ -457,8 +457,8 @@ when <command> is:
   state     get current state
    plan     generate a plan
    bsig     deployment with distributed mechanism
-  agent     manage Nuri agent
-   edit     edit file
+  agent     manage the agent
+   edit     edit model file
    help     print this help
    exit     exit this console
 
@@ -565,8 +565,9 @@ where [command] is:
     state     get the current state
      plan     generate the plan
      bsig     deployment with distributed mechanism
-    agent     manage Nuri agent
+    agent     manage the agent
   console     enter console
+  version     print the version
 
 EOS
 
@@ -587,6 +588,8 @@ EOS
 				do_edit
 			when 'm', 'model'
 				do_model
+			when 'v', 'version'
+				puts About
 			else
 				puts banner
 			end
@@ -596,7 +599,7 @@ EOS
 	end
 end
 
-if $0 == __FILE__
+if File.basename($0) == File.basename(__FILE__)
 	Nuri.init
 	Nuri::Console.new.run
 end

data/nuri.gemspec

@@ -1,26 +1,26 @@
 Gem::Specification.new do |s|
-	s.name	                = 'nuri'
-	s.version               = File.read(File.dirname(__FILE__) + '/VERSION').sub(/\n/, '')
-	s.date                  = File.mtime(File.dirname(__FILE__) + '/VERSION').strftime("%Y-%m-%d")
-	s.summary               = 'Nuri'
-	s.description           = 'Automated workflow configuration tool'
-	s.authors               = ['Herry']
-	s.email                 = 'herry13@gmail.com'
+	s.name	            = 'nuri'
+	s.version           = File.read(File.dirname(__FILE__) + '/VERSION').sub(/\n/, '')
+	s.date              = File.mtime(File.dirname(__FILE__) + '/VERSION').strftime("%Y-%m-%d")
+	s.summary           = 'Nuri'
+	s.description       = 'intelligent configuration tool'
+	s.authors           = ['Herry']
+	s.email             = 'herry13@gmail.com'
 
-	s.executables << 'nuri'
-	s.files                 = `git ls-files`.split("\n").select { |n| !(n =~ /^(test|modules\/cell*|modules\/idol*)\/.*/) }
+	s.executables       << 'nuri'
+	s.files             = `git ls-files`.split("\n").select { |n| !(n =~ /^(test|modules\/cell*|modules\/idol*|examples)\/.*/) }
 
-	s.require_paths = ['lib']
+	s.require_paths     = ['lib']
 
-	s.license       = 'BSD'
+	s.license           = 'BSD'
 
-	s.homepage              = 'https://github.com/herry13/nuri'
-	s.rubyforge_project     = 'nuri'
+	s.homepage          = 'https://github.com/herry13/nuri'
+	s.rubyforge_project = 'nuri'
 
-	s.add_dependency 'sfplanner', '~> 0.2.1'
-	s.add_dependency 'sfpagent', '~> 0.3'
-	s.add_dependency 'colorize', '~> 0.6'
-	s.add_dependency 'coderay', '~> 1'
+	s.add_dependency 'sfplanner'
+	s.add_dependency 'sfpagent'
+	s.add_dependency 'colorize'
+	s.add_dependency 'coderay'
 
 	s.add_development_dependency 'rake'
 end	

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: nuri
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfplanner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sfpagent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Automated workflow configuration tool
+description: intelligent configuration tool
 email: herry13@gmail.com
 executables:
 - nuri
@@ -100,81 +100,6 @@ files:
 - bin/nuri-install-module
 - bin/nuri-sfwgraph
 - bin/nuri-uninstall-module
-- examples/.gitignore
-- examples/bonfire.sfp
-- examples/bonfire/epcc.sfp
-- examples/bonfire/epcc0.sfp
-- examples/bonfire/epcc2.sfp
-- examples/bonfire/epcc2a.sfp
-- examples/bonfire/inria.sfp
-- examples/bonfire/inria0.sfp
-- examples/bonfire/inria2.sfp
-- examples/bonfire/inria2a.sfp
-- examples/bonfire/inria2b.sfp
-- examples/bonfire/inria2c.sfp
-- examples/bonfire/inria2d.sfp
-- examples/bonfire/inria2e.sfp
-- examples/bonfire/main.sfp
-- examples/bonfire/old/bonfire-1-1-1.sfp
-- examples/bonfire/old/bonfire-1-10-1.sfp
-- examples/bonfire/old/bonfire-1-2-1.sfp
-- examples/bonfire/old/bonfire-1-3-1.sfp
-- examples/bonfire/old/bonfire-1-4-1.sfp
-- examples/bonfire/old/bonfire-1-5-1.sfp
-- examples/bonfire/old/bonfire-1-6-1.sfp
-- examples/bonfire/old/bonfire-1-7-1.sfp
-- examples/bonfire/old/bonfire-1-8-1.sfp
-- examples/bonfire/old/bonfire-1-9-1.sfp
-- examples/bonfire/old/wp-test1a.sfp
-- examples/bonfire/old/wp-test1b.sfp
-- examples/bonfire/old/wp-test1c.sfp
-- examples/bonfire/old/wp-test2.sfp
-- examples/bonfire/old3/bonfire-epcc.sfp
-- examples/bonfire/old3/bonfire-inria.sfp
-- examples/bonfire/old3/bonfire-master.sfp
-- examples/bonfire/old3/bonfire.sfp
-- examples/bonfire/old3/bonfire2.sfp
-- examples/bonfire/old3/bonfire3.sfp
-- examples/bonfire/old3/bonfire4.sfp
-- examples/bonfire/old3/bonfire5.sfp
-- examples/bonfire/old3/bonfire5b.sfp
-- examples/bonfire/old3/hpvm6.sfp
-- examples/bonfire/old3/model.json
-- examples/bonfire/old3/test0.sfp
-- examples/bonfire/old3/test1.sfp
-- examples/bonfire/old3/test10.sfp
-- examples/bonfire/old3/test2.sfp
-- examples/bonfire/old3/test3.sfp
-- examples/bonfire/old3/test4.sfp
-- examples/bonfire/old3/test5.sfp
-- examples/bonfire/old3/test6.sfp
-- examples/bonfire/old3/test7.sfp
-- examples/bonfire/old3/test8.sfp
-- examples/bonfire/old3/test9.sfp
-- examples/bonfire/old3/wordpress-test-cluster.sfp
-- examples/bonfire/old3/wordpress-test.sfp
-- examples/bonfire/old3/wp-test-2.sfp
-- examples/bonfire/test.sfp
-- examples/hadoop1.sfp
-- examples/hadoop2.sfp
-- examples/hpcloud.sfp
-- examples/mockcloud/apache2.sfp
-- examples/mockcloud/generator.rb
-- examples/mockcloud/generator.rb.bak
-- examples/mockcloud/hadoop2.sfp.template
-- examples/mockcloud/ping.rb
-- examples/mockcloud/run.rb
-- examples/openstack/openstack-hadoop1-cluster.sfp
-- examples/openstack/openstack-hadoop2-cluster.sfp
-- examples/test.inc
-- examples/test.sfp
-- examples/v2/apache.sfp
-- examples/v2/aptpackage.sfp
-- examples/v2/mock1.sfp
-- examples/v2/package.sfp
-- examples/v2/service.sfp
-- examples/v2/tarpackage.sfp
-- examples/wordpress.sfp
 - lib/naas/d3.js
 - lib/naas/d3.v3.min.js
 - lib/naas/index.css

data/examples/.gitignore

@@ -1,4 +0,0 @@
-*cell*
-*.log
-*.log.*
-*idol*

data/examples/bonfire.sfp

@@ -1,87 +0,0 @@
-include "modules/node/node.sfp"
-include "modules/vm/vm.sfp"
-include "modules/apache/apache.sfp"
-include "modules/mysql/mysql.sfp"
-include "modules/wordpresscluster/wordpresscluster.sfp"
-include "modules/bonfire/bonfire.sfp"
-
-proxy isa Node {
-	sfpAddress is "localhost"
-	epcc isa Bonfire {
-		experiment is "autocloud"
-		location is "uk-epcc"
-		image_name is "BonFIRE Debian Squeeze 10G v5"
-		wan_name is "BonFIRE WAN"
-	}
-}
-
-vmlb isa VM {
-	created = true
-	apache isa Apache {
-		running is true
-		is_load_balancer is true
-		lb_members is (vmapp1,vmapp2,vmapp3,vmapp4,vmapp5)
-	}
-	in_cloud is proxy.epcc
-}
-vmapp1 extends vmlb {
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vmapp1.apache
-		database is vmdb.wp_db
-	}
-}
-vmapp2 extends vmlb {
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vmapp2.apache
-		database is vmdb.wp_db
-	}
-}
-vmapp3 extends vmlb {
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vmapp3.apache
-		database is vmdb.wp_db
-	}
-}
-vmapp4 extends vmlb {
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vmapp4.apache
-		database is vmdb.wp_db
-	}
-}
-vmapp5 extends vmlb {
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vmapp5.apache
-		database is vmdb.wp_db
-	}
-}
-vmdb isa VM {
-	created = true
-	mysql isa Mysql {
-		running is true
-	}
-	wp_db isa WordpressDB {
-		installed is true
-		mysql is vmdb.mysql
-	}
-	in_cloud is proxy.epcc
-}
-
-global {
-	if vmlb.apache.running = true then {
-		vmapp1.apache.running = true
-		vmapp2.apache.running = true
-		vmapp3.apache.running = true
-		vmapp4.apache.running = true
-		vmapp5.apache.running = true
-	}
-	if vmapp1.apache.running = true then vmdb.mysql.running = true
-	if vmapp2.apache.running = true then vmdb.mysql.running = true
-	if vmapp3.apache.running = true then vmdb.mysql.running = true
-	if vmapp4.apache.running = true then vmdb.mysql.running = true
-	if vmapp5.apache.running = true then vmdb.mysql.running = true
-}

data/examples/bonfire/epcc.sfp

@@ -1,43 +0,0 @@
-include "../modules/vm/vm.sfp"
-include "../modules/apache/apache.sfp"
-include "../modules/mysql/mysql.sfp"
-include "../modules/wordpresscluster/wordpresscluster.sfp"
-
-vm1 isa VM {
-	created = true
-	apache isa Apache {
-		running is true
-		is_load_balancer is true
-	}
-	in_cloud is proxy.epcc
-}
-vm2 isa VM {
-	created = true
-	apache isa Apache {
-		running is true
-	}
-	wp_web isa WordpressWeb {
-		installed is true
-		http is vm2.apache
-		database is vm10.wp_db
-	}
-	in_cloud is proxy.epcc
-}
-vm10 isa VM {
-	created = true
-	mysql isa Mysql {
-		running is true
-	}
-	wp_db isa WordpressDB {
-		installed is true
-		mysql is vm10.mysql
-	}
-	in_cloud is proxy.epcc
-}
-
-global {
-	if vm1.apache.running = true then {
-		vm2.apache.running = true
-	}
-	if vm2.apache.running = true then vm10.mysql.running = true
-}