topo-provision 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7f60bc7bb92f55a6a0ab6971369d1e52ba5a86
-  data.tar.gz: 5b51c4f439f90fc9f2295f17c587532dbae5f1fc
+  metadata.gz: c360dbd92b823258d67cb62d186882743a5e4404
+  data.tar.gz: b0b4ab6b8a2b81df1b72da7b6e55a9edd8194ced
 SHA512:
-  metadata.gz: 7966f33a13984bab417173716c03c21ede9d48378b6fb556871aeab9d4963de4eb5d2219341359383fef197cc94a6cde10cd53e6b90e7b520b901b6e5f29ea00
-  data.tar.gz: 90e2e7f8976a12381ee32bf9a7c4e6e08bc0500f0240a2f5079b8d4df5ecb2aaa234bcef3bfe693051b5647de58593b2d0053e1c49ae5ac2d0ff6257853fb0cb
+  metadata.gz: eee51503805e214da2d572e277928c87e581d02c2ccb05e7de9300b4d390958147208fa4c6f87b4e2e590afa0182dddf73db1e0c2348c82de36ac9f728efc7e5
+  data.tar.gz: e888d3a5ecfb1907391c7c177fdae9baf2bbc69990f1a99f99d9368ddd21c129e60470ac2f14b0865a9ef2d547d6b1bd06653c749029dc6aac361f3335c119df

data/README.md

@@ -8,8 +8,8 @@ plugin. In addition, it is possible to convert from other formats. The
 only converter currently implemented is for CloudFormation.
 
 This utility IS NOT READY FOR PRODUCTION USE. It is best described as a
-"proof of concept". It has been tested with a pre-release version of 
-chef-provisioning 1.0.
+"proof of concept". It has been tested with a pre-release build of 
+chef-provisioning 0.5.
 
 ## Features
 

data/lib/topo/provision/aws/generators/machine.rb

@@ -18,9 +18,6 @@
 
 require 'topo/provision/generators/resource'
 
-#
-# The ResourceGenerator class generates the recipe resources  
-#
 
 module Topo
   module Provision
@@ -30,6 +27,11 @@ module Topo
         super
         @machine_options = convert_keys_to_sym_deep(@machine_options) if @machine_options
       end
+      
+      # AWS driver doesnt currently support stop
+      def stop()
+        default_action('stop')
+      end
      
     end
   end

data/lib/topo/provision/aws/generators/machine_image.rb

@@ -32,6 +32,11 @@ module Topo
         @resource_attributes['image_options'] = convert_keys_to_sym_deep(opts) if opts
         @machine_options = convert_keys_to_sym_deep(@machine_options) if @machine_options
       end
+      
+      # AWS driver doesnt currently support stop
+      def stop()
+        default_action('stop')
+      end
      
     end
   end

data/lib/topo/provision/generators/resource.rb

@@ -34,7 +34,7 @@ module Topo
       def initialize(data)
         @resource_type||= "resource"  # define in each class
         @template_base_name = @resource_type
-        @undeploy_action = "delete"
+        @undeploy_action = "destroy"
         @resource_attributes = {}  # define in each class
         @name = data['name']
         provisioning = data['provisioning']

data/lib/topo/provision/generators/templates/machine_deploy.erb

@@ -3,7 +3,10 @@
 <% resource_attributes.each do |key, val| %><%="  #{key}(#{val.inspect})\n" %><% end %>
 <% normal_attributes.each do |key, val| %><%="  attribute '#{key}', #{val.inspect} \n" %><% end %>
 <% lazy_attributes.each do |key, val| %><%="  attribute '#{key}', lazy{
-    topo_search_node_fn = Proc.new { |node, path| (search(:node, \"name:\" + node, :filter_result => { 'val' => path }).first)['data']['val'] }
+    topo_search_node_fn = Proc.new { |node, path| 
+      result = search(:node, \"name:\" + node, :filter_result => { 'val' => path }).first
+      result['val'] if result 
+    }
     {#{val}}
    } \n" %><% end %>
 <% if (machine_options) %><%= "  add_machine_options(#{machine_options.inspect})\n" %><% end %>

data/lib/topo/provision/version.rb

@@ -1,5 +1,5 @@
 module Topo
   module Provision
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/topo/utils/parsegen.rb

@@ -88,13 +88,9 @@ module Topo
       str
     end
 
-    # Expand a particular reference into either a node search
-    # In future, may need to search resource type data bag, e.g. using
-    # topo_search_data_bag_fn = Proc.new { |bag, id, path| (search(bag, "id:#{id}", :filter_result => { 'val' => path }).first)['data']['val'] }
-    #
+    # Expand a particular reference into a node search
    def expand_ref(ref)
      path = ref['path']
-     # Wanted to use the following and define a proc, but does not work for some resources
      "topo_search_node_fn.call(#{ref['name'].inspect}, #{path})"
    end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topo-provision
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli