vagrant-compose 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b301a6a6168fb5d273e7cc98304c808f07609304
-  data.tar.gz: cf8fe8a74f47f7e7f85dbe3cfe8854545fe88ac2
+  metadata.gz: b2ca4a2adb7273d09c0650fa06fc3d3f059d8e3a
+  data.tar.gz: 95c5b8b69f87f119e51b76507cba24716902625c
 SHA512:
-  metadata.gz: df46b624b131f9fc8e81c217b9d894ba1b6aaf3111de9e88438c6a00d3ec698efec71cdc82fcb6c477631547001ba09c56d336444ce2b87118d2358b2c295340
-  data.tar.gz: 14403ed71cafd28eda089b2bfea7c918fb5c7f919aa9e6ae04ee37d5c1ab08c706edd7f2460132f35dafbe6dc1022c88f768c2a666faa8bd2956fe56be0f2250
+  metadata.gz: f24a63d849bd0b574bed06bdcc1e454b6549f93a1ef0bd4367888541cf889f5bdf79f5e13ccfc320c9a546ce4712181428e5a5a905ba2c56a335b42753df30d8
+  data.tar.gz: 1a682bf36be2fb2d1b6501bbae5ed7b04e29d206d7c8aa45192b584d0ecdd37f58787c2f2357d0e37826a44bd27eccc0b9503f633a5719c8a9cb217973db9496

data/.gitignore

@@ -17,4 +17,4 @@ Vagrantfile
 
 # Test
 provisioning
-declarative.yaml
+*.yaml

data/CHANGELOG.md

@@ -35,3 +35,8 @@ ansible_group_vars_path and ansible_host_vars_path are not supported anymore
 # 0.7.0 (November 02, 2016)
 
 * introduced support for declarative cluster definition
+
+# 0.7.1 (November 04, 2016)
+
+* Minor fix
+

data/README.md

@@ -33,13 +33,13 @@ Vagrant-compose supports two appraches for definining a cluster of VMs.
 
   Cluster are defined by using the some ruby knowledge that is required for writing Vagrantfiles.
 
-  see [Programmatic Approach](http://pippo) for more details.
+  see [Programmatic Approach](https://github.com/fabriziopandini/vagrant-compose/blob/master/doc/programmatic.md) for more details.
 
 - Declarative Approach
 
   By using the declarative approach also people with limited programming background can use vagrant-compose to easily define a cluster composed by many VMs; with declarative approach,  the definition of the cluster is done in yaml, and the ruby programming part within the Vagrantfile is reduced to the minimum.
 
-  see [Declarative Approach](http://pippo) for more details.
+  see [Declarative Approach](https://github.com/fabriziopandini/vagrant-compose/blob/master/doc/declarative.md) for more details.
 
 # Additional notes
 Vagrant compose will play nicely with all vagrant commands.

data/lib/vagrant/compose/declarative/cluster.rb

@@ -24,27 +24,27 @@ module VagrantPlugins
         # It defaults to current directory/provisioning
         attr_accessor :ansible_playbook_path
 
-      	# Costruttore di una istanza di cluster.
+        # Costruttore di una istanza di cluster.
         def initialize()
-        	@multimachine_filter = ""
+          @multimachine_filter = ""
         end
 
         # Implements cluster creation from a playbook file
-	      def from (file)
-	        # calls vagrant-playbook utility for executing the playbook file.
-	        playbook = YAML.load(pycompose (file))
+        def from (file)
+          # calls vagrant-playbook utility for executing the playbook file.
+          playbook = YAML.load(pycompose (file))
 
-	        # extract cluster attributes
-	        @name   								= playbook.keys[0]
-	        @box    								= playbook[@name]['box']
-	        @domain 								= playbook[@name]['domain']
-	        @ansible_playbook_path  = playbook[@name]['ansible_playbook_path']
+          # extract cluster attributes
+          @name                   = playbook.keys[0]
+          @box                    = playbook[@name]['box']
+          @domain                 = playbook[@name]['domain']
+          @ansible_playbook_path  = playbook[@name]['ansible_playbook_path']
 
           # extract nodes
           nodes = []
           playbook[@name]['nodes'].each do |node|
 
-          	boxname = node.keys[0]
+            boxname = node.keys[0]
 
             box             = node[boxname]['box']
             hostname        = node[boxname]['hostname']
@@ -64,74 +64,79 @@ module VagrantPlugins
           # extract ansible inventory, ansible_group_vars, ansible_host_vars
           ansible_groups = {}
           if playbook[@name].key?("ansible")
-          	ansible = playbook[@name]['ansible']
-
-          	# extract ansible inventory
-          	ansible_groups = ansible['inventory']
-
-          	# cleanup ansible_group_vars files
-	          # TODO: make safe
-	          ansible_group_vars_path = File.join(@ansible_playbook_path, 'group_vars')
-
-	          FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
-	          Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
-
-	          #generazione ansible_group_vars file (NB. 1 group = 1 gruppo host ansible)
-	          ansible['group_vars'].each do |group, vars|
-	            # crea il file (se sono state generate delle variabili)
-	            unless vars.empty?
-	              # TODO: make safe
-	              File.open(File.join(ansible_group_vars_path,"#{group}.yml") , 'w+') do |file|
-	                file.puts YAML::dump(vars)
-	              end
-	            end
-	          end
-
-	          # cleanup ansible_host_vars files (NB. 1 nodo = 1 host)
-	          # TODO: make safe
-	          ansible_host_vars_path = File.join(@ansible_playbook_path, 'host_vars')
-
-	          FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
-	          Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
-
-	          #generazione ansible_host_vars file 
-	          ansible['host_vars'].each do |host, vars|
-	            # crea il file (se sono state generate delle variabili)
-	            unless vars.empty?
-	              # TODO: make safe
-	              File.open(File.join(ansible_host_vars_path,"#{host}.yml") , 'w+') do |file|
-	                file.puts YAML::dump(vars)
-	              end
-	            end
-	          end
-          end
 
-	        return nodes, ansible_groups 
-	      end
+            ansible = playbook[@name]['ansible']
+
+            # extract ansible inventory
+            ansible_groups = ansible['inventory']
+
+            # cleanup ansible_group_vars files
+            # TODO: make safe
+            ansible_group_vars_path = File.join(@ansible_playbook_path, 'group_vars')
+
+            FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
+            Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+
+            #generazione ansible_group_vars file (NB. 1 group = 1 gruppo host ansible)
+            if ansible.key?("group_vars")
+              ansible['group_vars'].each do |group, vars|
+                # crea il file (se sono state generate delle variabili)
+                unless vars.empty?
+                  # TODO: make safe
+                  File.open(File.join(ansible_group_vars_path,"#{group}.yml") , 'w+') do |file|
+                    file.puts YAML::dump(vars)
+                  end
+                end
+              end
+            end
+
+            # cleanup ansible_host_vars files (NB. 1 nodo = 1 host)
+            # TODO: make safe
+            ansible_host_vars_path = File.join(@ansible_playbook_path, 'host_vars')
+
+            FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
+            Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+
+            #generazione ansible_host_vars file 
+            if ansible.key?("host_vars")
+              ansible['host_vars'].each do |host, vars|
+                # crea il file (se sono state generate delle variabili)
+                unless vars.empty?
+                  # TODO: make safe
+                  File.open(File.join(ansible_host_vars_path,"#{host}.yml") , 'w+') do |file|
+                    file.puts YAML::dump(vars)
+                  end
+                end
+              end
+            end
+          end
 
+          return nodes, ansible_groups 
+        end
 
-	      # Executes pycompose command
-	      def pycompose (file)
-	        p_err = ""
-	        p_out = ""
 
-	        begin
-	          p_status = Open4::popen4("vagrant-playbook -f #{file}") do |pid, stdin, stdout, stderr|
-	              p_err = stderr.read.strip
-	              p_out = stdout.read.strip
-	          end
-	        rescue Errno::ENOENT
-	          raise VagrantPlugins::Compose::Errors::PyComposeMissing
-	        rescue Exception => e
-	          raise VagrantPlugins::Compose::Errors::PyComposeError, :message => e.message
-	        end
+        # Executes pycompose command
+        def pycompose (file)
+          p_err = ""
+          p_out = ""
+
+          begin
+            p_status = Open4::popen4("vagrant-playbook -f #{file}") do |pid, stdin, stdout, stderr|
+                p_err = stderr.read.strip
+                p_out = stdout.read.strip
+            end
+          rescue Errno::ENOENT
+            raise VagrantPlugins::Compose::Errors::PyComposeMissing
+          rescue Exception => e
+            raise VagrantPlugins::Compose::Errors::PyComposeError, :message => e.message
+          end
 
-	        if p_status.exitstatus != 0
-	          raise VagrantPlugins::Compose::Errors::PyComposeError, :message => p_err
-	        end
+          if p_status.exitstatus != 0
+            raise VagrantPlugins::Compose::Errors::PyComposeError, :message => p_err
+          end
 
-	        return p_out
-	      end
+          return p_out
+        end
 
       end
     end

data/lib/vagrant/compose/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Compose
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-compose
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Fabrizio Pandini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +92,6 @@ files:
 - lib/vagrant/compose/version.rb
 - lib/vagrant/compose.rb
 - LICENCE
-- provisioning/group_vars/zookeeper.yml
 - Rakefile
 - README.md
 - vagrant-compose.gemspec

data/provisioning/group_vars/zookeeper.yml

@@ -1,2 +0,0 @@
----
-x: 1