catfish 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63b69165aada8de23e53e4022a6acf0b3500093
-  data.tar.gz: 34bd5c4600e0d32a6ef1be3ab07426041093b921
+  metadata.gz: 74963910c0c501a10a4eb5c44ad4de8c95d25be9
+  data.tar.gz: 1041ab59f8293a410d06cd0b868085b839b9bfdf
 SHA512:
-  metadata.gz: 19103395e52ac6776a15947222b5f5323b71bea9e30baf17589388069b5f1869bfb6d998e1df4e4a2a70f140c491515c7bb6de113f2331dab623495300c50c5d
-  data.tar.gz: cb8bb9b8117ea866d22594496486e559c24764514a55e35cc22348bdcd44d24585ded1c0c38a7589dfdc69fc5c686e65a7033904b2a4a410523251e2d6e0a261
+  metadata.gz: f26cc28d1d4b64ed91237f95f9c4397efd660796139e4fddf91e4f6eee007c1cd706881a504f4eff8ce9bd9374945b9749cccb07102cf17f3ea23649200bd87f
+  data.tar.gz: deb1cac85cd409ab9cae112b973daaaad7ad8d8fa991f2a9b1539b91bfc4f0e97a695ae5a2a21cdc747f0b6110d42b9f1a73271e18561149da6d338f3e911949

data/.vagrant/machines/10.52.100.79/managed/id

@@ -0,0 +1 @@
+10.52.100.79

data/.vagrant/machines/10.52.100.79/managed/index_uuid

@@ -0,0 +1 @@
+43c409ec41664be6a0323efe51fadc38

data/.vagrant/machines/10.52.101.106/managed/id

@@ -0,0 +1 @@
+10.52.101.106

data/.vagrant/machines/10.52.101.106/managed/index_uuid

@@ -0,0 +1 @@
+64a8ed314d0748a9b5567f5e122dad48

data/README.md

@@ -56,7 +56,6 @@ And you can even run the provisioning in parallel
 
 ## TODO
 
-- Perform resolve as part of provision to simplify the flow
 - Puppet provisioner support
 - Vagrant plugin support in Catfishfile
 - WinRM support

data/Rakefile

@@ -1,4 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
+require 'rake/clean'
+
+CLEAN.include('Catfishfile', 'Catfishfile.lock', 'Vagrantfile')
 
 RuboCop::RakeTask.new

data/lib/catfish/cli/init.rb

@@ -17,10 +17,14 @@ module Catfish
         }
 
         opts = {
+          provisioners: options[:provisioners] || [],
+          shell_paths: options['shell-paths'] || ['{{PATH_TO_YOUR_SCRIPT}}'],
+          communicator: options[:communicator] || 'ssh',
+          winrm_username: options['winrm-username'] || '{{YOUR_WINRM_USERNAME}}',
+          winrm_password: options['winrm-password'] || '{{YOUR_WINRM_PASSWORD}}',
           ssh_username: options['ssh-username'] || '{{YOUR_SSH_USERNAME}}',
           ssh_private_key_path: options['ssh-private-key-path'] || '{{PATH_TO_YOUR_SSH_PRIVATE_KEY}}',
-          provisioners: options[:provisioners] || [],
-          shell_paths: options['shell-paths'] || ['{{PATH_TO_YOUR_SCRIPT}}']
+          servers: options['servers'] || []
         }
 
         templates.each do |src, dst|

data/lib/catfish/cli.rb

@@ -31,9 +31,13 @@ module Catfish
     TODO: Long description
     D
     method_option 'provisioners', type: :array, banner: 'A list of vagrant provisiners to use'
+    method_option 'communicator', type: :string, banner: 'The communicator. ssh (default) or winrm'
+    method_option 'winrm-username', type: :string, banner: 'Username for winrm. Used with --communicator=winrm'
+    method_option 'winrm-password', type: :string, banner: 'Password for winrm. Used with --communicator=winrm'
     method_option 'shell-paths', type: :array, banner: 'A list of paths to use if shell provisioning is selected'
     method_option 'ssh-username', type: :string, banner: 'SSH username'
     method_option 'ssh-private-key-path', type: :string, banner: 'Path to SSH private key'
+    method_option 'servers', type: :array, banner: 'Initial list of servers to include in Catfishfile'
     def init
       require 'catfish/cli/init'
       Init.new(options.dup, self).run

data/lib/catfish/templates/Catfishfile.tt

@@ -1,3 +1,6 @@
 # A sample Catfishfile
 
 # server 'myserver.mydomain.com'
+<% config[:servers].each do |server| -%>
+server '<%= server %>'
+<% end %>

data/lib/catfish/templates/Vagrantfile.tt

@@ -3,24 +3,31 @@
 
 Vagrant.configure("2") do |config|
 
-	config.vm.box = "tknerr/managed-server-dummy"
+  config.vm.box = "tknerr/managed-server-dummy"
 <% config[:provisioners].each do |provisioner| -%>
 <% if provisioner == 'shell' -%>
 <% config[:shell_paths].each do |path| -%>
-	config.vm.provision 'shell', path: '<%= path %>'
+  config.vm.provision 'shell', path: '<%= path %>'
 <% end -%>
 <% end -%>
 <% end -%>
 
-	instances = File.readlines('Catfishfile.lock').map(&:chomp)
-	instances.each do |instance|
-		next if instance.start_with? '#'
-		config.vm.define "#{instance}" do |box|
-			box.vm.provider :managed do |managed, override|
-				managed.server = instance
-				override.ssh.username = '<%= config[:ssh_username] %>'
-				override.ssh.private_key_path = '<%= config[:ssh_private_key_path] %>'
-			end
-		end
-	end
+<% if config[:communicator] == 'winrm' -%>
+  config.vm.communicator = '<%= config[:communicator] %>'
+  config.vm.winrm.username = '<%= config[:winrm_username] %>'
+  config.vm.winrm.password = '<%= config[:winrm_password] %>'
+<% end -%>
+
+  instances = File.readlines('Catfishfile.lock').map(&:chomp)
+  instances.each do |instance|
+    config.vm.define "#{instance}" do |box|
+      box.vm.provider :managed do |managed, override|
+        managed.server = instance
+<% if config[:communicator] == 'ssh' -%>
+        override.ssh.username = '<%= config[:ssh_username] %>'
+        override.ssh.private_key_path = '<%= config[:ssh_private_key_path] %>'
+<% end -%>
+      end
+    end
+  end
 end

data/lib/catfish/version.rb

@@ -1,3 +1,3 @@
 module Catfish
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catfish
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Christopher Baldauf
@@ -76,6 +76,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
+- .vagrant/machines/10.52.100.79/managed/id
+- .vagrant/machines/10.52.100.79/managed/index_uuid
+- .vagrant/machines/10.52.101.106/managed/id
+- .vagrant/machines/10.52.101.106/managed/index_uuid
 - Gemfile
 - LICENSE
 - README.md