nuri 0.5.3 → 0.5.4

data/modules/package2/package2.sfp

@@ -2,9 +2,10 @@ schema Package2 {
 	installed : Bool
 
 	final name = ""
-	final version = "latest"
-	final source = "default"
 	final provider = "apt"
+	final version = "latest"
+	final source = ""
+	final home = ""
 
 	synchronized sub install {
 		effect {

data/modules/pyfile/README.md

@@ -0,0 +1,4 @@
+pyfile module
+=============
+
+This is an example module written in a non-Ruby programming language (Python).

data/modules/vm/vm.rb

@@ -1,8 +1,10 @@
 require File.expand_path(File.dirname(__FILE__)) + "/../machine/machine.rb"
 
 class Sfp::Module::VM < Sfp::Module::Machine
+	InCloud = "#{Sfp::Agent::Home}/vm.in_cloud"
+
 	def update_state
 		self.class.superclass.instance_method(:update_state).bind(self).call
-		@state['in_cloud'] = @model['in_cloud']
+		@state['in_cloud'] = (File.exist?(InCloud) ? File.read(InCloud).strip : '')
 	end
 end

data/modules/vm/vm.sfp

@@ -7,12 +7,13 @@ schema VM extends Machine {
 
 	final cpus = 1
 	final memory = 512
-	final network { }
-	final disk { }
+	final networks { }
+	final disks { }
 
-	final username = ""
 	final flavor = ""
 	final image = ""
 	final security_group = ""
+
+	final ssh_user = ""
 	final ssh_key_name = ""
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuri
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfplanner
@@ -158,12 +158,22 @@ files:
 - 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
@@ -183,6 +193,7 @@ files:
 - lib/nuri/server.rb
 - lib/nuri/targz.rb
 - modules/.gitignore
+- modules/README.md
 - modules/apache/apache.rb
 - modules/apache/apache.rb.old
 - modules/apache/apache.sfp
@@ -229,7 +240,6 @@ files:
 - modules/hpcloud/example.sfp
 - modules/hpcloud/hpcloud.rb
 - modules/hpcloud/hpcloud.sfp
-- modules/hpcloud/test.sfp
 - modules/machine/machine.rb
 - modules/machine/machine.sfp
 - modules/mockcloud/mockcloud.rb
@@ -241,13 +251,20 @@ files:
 - modules/node/node.sfp
 - modules/object/object.rb
 - modules/object/object.sfp
+- modules/openstack/README.md
+- modules/openstack/config.yml
+- modules/openstack/example.sfp
+- modules/openstack/openstack.rb
+- modules/openstack/openstack.sfp
 - modules/os/os.rb
 - modules/os/os.sfp
 - modules/package/package.rb
 - modules/package/package.sfp
 - modules/package/test.sfp
+- modules/package2/apt-repo-list.sh
 - modules/package2/package2.rb
 - modules/package2/package2.sfp
+- modules/pyfile/README.md
 - modules/pyfile/main
 - modules/pyfile/pyfile.sfp
 - modules/service/service.rb

data/modules/hpcloud/test.sfp

@@ -1,5 +0,0 @@
-include "hpcloud.sfp"
-
-a isa HPCloud {
-	
-}