catfish 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4f16456fc2a0292aaa6f563b208221a7d773f1
-  data.tar.gz: 5427abeed216170b88c413e07c561bfed507579b
+  metadata.gz: e52c11f61f31793e6c0ac553a99194d1561c109d
+  data.tar.gz: 6b4cb85095aaf1ea865c98b6a526b189c7ed69a0
 SHA512:
-  metadata.gz: 9d66e6106c7a1b0d6b3e3dc145fd1d5fe43e35a98f94d14c6c63e3289f46bf620a7b9883381950e43ed6d97d76f77936d735d063162f438afbfbad7de76cb26d
-  data.tar.gz: 8d57477e3863d3660c7d9804b8ec04ef0e8a4c272ebcdb7d5f291a58c97e767d5f66994184c7629363e5cdc88c8ba2b5a626407c2dec2776bbb9d58ee574b89d
+  metadata.gz: 5b206cc2edbd443ece2160f6aca5a60760d345a2cf05ac91610d3744e255970faeb2f70bd291c976473f2ab98c77d5e8f7ff48aa5824f1ff9198da79bc630a61
+  data.tar.gz: da9abc0e61b1afea9954e19d371c46a7ce12ae708699b60d338b8f2c60be05cac34c358adfbc704f7e14c24112c0773c729f85d3bd56e008621f2e4378dc9cb3

data/README.md

@@ -27,22 +27,32 @@ Catfishfile and a Vagrantfile at a minimum.
 
     $ catfish init
 
-Specify connection options for ssh
+Include two shell script provisioners
 
-    $ catfish init --ssh-username=YOUR_USERNAME --ssh-private-key-path=YOUR_SSH_KEY_PATH
+    $ catfish init --shell --shell-paths=./script/a.sh ./script/b.sh
 
-Include two shell provisioners
+You can template out a puppet repository
 
-    $ catfish init --provisioners=shell --shell-paths=./script/a.sh ./script/b.sh
+    $ catfish init --puppet
 
-### Add the target servers in your Catfishfile
+Initialize a Windows configuration using winrm
+
+    $ catfish init --windows
+
+### Managed servers
+Catfish can also help you manage pre-existing servers that can communicate over
+SSH or WinRM. To enable managed mode, make sure to pass the `--managed` flag to init
+
+    $ catfish init --managed --ssh-username=YOUR_USERNAME --ssh-private-key-path=YOUR_SSH_KEY_PATH
+
+Add the target servers in your Catfishfile
 
 ```ruby
 server 'myserver1.mydomain.com'
 server 'myserver2.mydomain.com'
 ```
 
-### Provision your servers
+Provisioning
 
     $ catfish provision
 
@@ -66,7 +76,6 @@ plugin 'vagrant-hostmaster'
 
 ## TODO
 
-- Puppet provisioner support
 - Add some spec tests
 
 ## Contributing

data/lib/catfish/cli/clean.rb

@@ -0,0 +1,9 @@
+module Catfish
+  class CLI::Clean
+
+    def run
+      puts 'Cleaning Catfishfile.lock'
+      FileUtils.rm 'Catfishfile.lock', force: true
+    end
+  end
+end

data/lib/catfish/cli/init.rb

@@ -23,6 +23,10 @@ module Catfish
         plugins << 'vagrant-librarian-puppet' if options['puppet-librarian-puppet']
 
         opts = {
+          local: options[:local],
+          local_box: options['local-box'],
+          local_box_url: options['local-box-url'],
+          managed: options[:managed],
           provisioners: provisioners                || [],
           shell_paths: options['shell-paths']       || ['{{PATH_TO_YOUR_SCRIPT}}'],
           puppet_hiera: options['puppet-hiera'],
@@ -32,7 +36,7 @@ module Catfish
           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}}',
-          servers: options['servers']               || [],
+          managed_servers: options['managed-servers']               || [],
           plugins: plugins                          || []
         }
 

data/lib/catfish/cli/provision.rb

@@ -7,14 +7,14 @@ module Catfish
     end
 
     def run
-      p 'Provisioning to servers using Catfishfile.lock'
+      puts 'Provisioning to servers using Catfishfile.lock'
       vagrant_version
       begin
         # Connect to the servers. The --provider=managed is the key here.
-        system("vagrant up --provider=#{options[:provider]}")
+        system("vagrant up /managed/ --provider=#{options[:provider]}")
 
         # Confirm the connectivity
-        status = `vagrant status --machine-readable`
+        status = `vagrant status /managed/ --machine-readable`
         if status.include? 'not reachable'
           abort 'ERROR DEPLOYING: One or more servers could not be connected to'
         end
@@ -24,7 +24,7 @@ module Catfish
       ensure
 
         # Disconnect from all of the servers
-        system 'vagrant destroy -f'
+        system 'vagrant destroy -f /managed/'
 
       end
     end
@@ -50,7 +50,8 @@ module Catfish
 
         threads.each(&:join)
       else
-        system 'vagrant provision'
+        command = 'vagrant provision /managed/'
+        system command
       end
     end
   end

data/lib/catfish/cli.rb

@@ -22,6 +22,11 @@ module Catfish
     TODO: Long description
     D
     method_option 'provisioners', type: :array, banner: 'A list of vagrant provisiners to use'
+    method_option 'local', type: :boolean, default: true, banner: 'Set up a local vm for use with vagrant'
+    method_option 'local-box', type: :string, banner: 'Vagrant box for use with local VM'
+    method_option 'local-box-url', type: :string, banner: 'Vagrant box url for use with local VM'
+    method_option 'managed', type: :boolean, default: false, banner: 'Set up capability for vagrant-managed-servers'
+    method_option 'managed-servers', type: :array, banner: 'Initial list of servers to include in Catfishfile'
     method_option 'communicator', type: :string, banner: 'The communicator. ssh (default) or winrm'
     method_option 'windows', type: :boolean, banner: 'Shorthand for --communicator=winrm'
     method_option 'winrm-username', type: :string, banner: 'Username for winrm. Used with --communicator=winrm'
@@ -31,10 +36,9 @@ module Catfish
     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 'puppet', type: :boolean, banner: 'Shorthand for provisioners=puppet'
-    method_option 'puppet-librarian-puppet', type: :boolean, default: 'true',
+    method_option 'puppet-librarian-puppet', type: :boolean, default: true,
                   banner: 'Whether or not to include a default Puppetfile and librarian puppet plugin'
-    method_option 'puppet-hiera', type: :boolean, default: 'true', banner: 'Include hiera templates. Only applies to puppet provisioner'
-    method_option 'servers', type: :array, banner: 'Initial list of servers to include in Catfishfile'
+    method_option 'puppet-hiera', type: :boolean, default: true, banner: 'Include hiera templates. Only applies to puppet provisioner'
     method_option 'plugins', type: :array, banner: 'Vagrant plugins to be installed'
     def init
       require 'catfish/cli/init'
@@ -53,14 +57,25 @@ module Catfish
       Plugin.new(options.dup).run
     end
 
+    desc 'clean', 'Clean Catfishfile.lock'
+    def clean
+      require 'catfish/cli/clean'
+      Clean.new.run
+    end
+
     desc 'provision [OPTIONS]', 'Provision to the servers specified in Catfishfile.lock'
     method_option 'provider', type: :string, default: 'managed', banner: 'Vagrant provider to use.'
-    method_option 'parallel', type: :boolean, default: 'false', banner: 'Run provisioning in parallel'
+    method_option 'parallel', type: :boolean, default: false, banner: 'Run provisioning in parallel'
     def provision
+      exists_before_resolve = File.exist?('Catfishfile.lock')
       invoke :resolve
       invoke :plugin
       require 'catfish/cli/provision'
       Provision.new(options.dup).run
+
+      # If the Catfishfile.lock existed before the start of the run, then
+      # we should leave it there. Otherwise, we should clean it up.
+      FileUtils.rm 'Catfishfile.lock', force: true unless exists_before_resolve
     end
   end
 end

data/lib/catfish/templates/Catfishfile.tt

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

data/lib/catfish/templates/Vagrantfile.tt

@@ -3,7 +3,6 @@
 
 Vagrant.configure("2") do |config|
 
-  config.vm.box = "tknerr/managed-server-dummy"
 <% if config[:provisioners].include? 'shell' -%>
 <% config[:shell_paths].each do |path| -%>
   config.vm.provision 'shell', path: '<%= path %>'
@@ -21,20 +20,36 @@ Vagrant.configure("2") do |config|
 <% 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[:local] -%>
+  config.vm.define 'local' do |local|
+    local.vm.box = "<%= config[:local_box] %>"
+<% if config[:local_box_url] -%>
+    local.vm.box_url = "<%= config[:local_box_url] %>"
+<% end -%>
+  end
+<% end -%>
+
+<% if config[:managed] -%>
+  if File.exist?('Catfishfile.lock')
+    instances = File.readlines('Catfishfile.lock').map(&:chomp)
+    instances.each do |instance|
+      config.vm.define "managed-#{instance}" do |box|
+        box.vm.box = "tknerr/managed-server-dummy"
+        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] %>'
+          override.ssh.username = '<%= config[:ssh_username] %>'
+          override.ssh.private_key_path = '<%= config[:ssh_private_key_path] %>'
 <% end -%>
+<% if config[:communicator] == 'winrm' -%>
+          instance.vm.winrm.username = '<%= config[:winrm_username] %>'
+          instance.vm.winrm.password = '<%= config[:winrm_password] %>'
+<% end -%>
+        end
       end
     end
   end
+<% end -%>
 end

data/lib/catfish/version.rb

@@ -1,3 +1,3 @@
 module Catfish
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catfish
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - catfish.gemspec
 - lib/catfish.rb
 - lib/catfish/cli.rb
+- lib/catfish/cli/clean.rb
 - lib/catfish/cli/init.rb
 - lib/catfish/cli/plugin.rb
 - lib/catfish/cli/provision.rb