vagrant-orchestrate 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6337e73b1299cc2a5ddfbd7bc634f910c22613
-  data.tar.gz: c40465611605716c68d8e0a7f547a8471ffe85ea
+  metadata.gz: 51dd296ac863762ad204a963f075e5691e877302
+  data.tar.gz: 2f4a44895ba86bdaadc9253c14f91b2222a857f2
 SHA512:
-  metadata.gz: 3b72416ac1cb3ed860aedf7ecb872df81d57942ad8e5ec90b4802e5e6a4b6e0801fff9c1e0eb573b64ebb816822d504d3285d46aeecd5916c86e603aed3f70d5
-  data.tar.gz: 4ebd44c1049d983ac78d56458f61d30d4bfbe86f6447a3486c9de35765ef633222e25e4a64164d7b3493cd0a3bf5d152a4be3a07632a32f53a000d51e28869b1
+  metadata.gz: b8159b91712a2e1074e560d5705595d3319632180212cfc35c7723b7f7e3d00855a62542a58beeb595dbf00ca21061013e114b2c6aff04a9f5d1b8a6833b4f05
+  data.tar.gz: e6a7b2629048d07b61e312eff925e983062092d1361edc9ab6de89506d3ec720be52cbc35e49f8142c8159eba57c88b2cbb5932fa39eae2b4601e0d5da9709d1

data/.gitignore

@@ -13,6 +13,6 @@
 *.a
 mkmf.log
 
-/.vagrant/
+.vagrant/
 .DS_Store
 servers.json

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.6.5 (June 27th, 2015)
+
+  - Split GIT_BRANCH environment variable on slash and take the last element, since
+  that is how Jenkins is providing it. [#40](https://github.com/Cimpress-MCP/vagrant-orchestrate/issues/40)
+
+0.6.4 (June 26th, 2015)
+
+  - Add common ignores to the `.gitignore` file in the root of the repo unless
+  `--no-git` is specified. Fixes [#28](https://github.com/Cimpress-MCP/vagrant-orchestrate/issues/28)
+
 0.6.3 (May 26th, 2015)
 
   - Extract the `required_plugins` definition and installation logic from the

data/README.md

@@ -172,6 +172,8 @@ Go ahead and push changes to your managed servers, in serial by default.
 
 The push command is currently limited to vagrant machines that use the `:managed` provider. So if you have other, local machines defined in the Vagrantfile, `vagrant orchestrate push` will not operate on those.
 
+Similar to the `up` and `provision` commands in vagrant, the `push` command can take in a regular expression for matching only certain machines. This is useful if your Vagrantfile contains all the managed machines, but you only want to push changes to a subset of those.
+
 ### Filtering managed commands
 It can be easy to make mistakes such as rebooting a production server if you have managed long-lived servers as well as local VMs defined in your Vagrantfile. We add some protection with the `orchestrate.filter_managed_commands` configuration setting, which will cause up, provision, reload, and destroy commands to be ignored for servers with the managed provider. This can be disabled by setting the variable to false in the Vagrantfile.
 
@@ -207,6 +209,8 @@ managed-4  2015-04-19 00:43:07 UTC  e983dddd8041c5db77494266328f1d266430f57d  cb
 ### Host
 
 * Need rsync? Install [OpenSSH](http://www.mls-software.com/opensshd.html) and then run this [script](https://github.com/joefitzgerald/packer-windows/blob/master/scripts/rsync.bat) to install rsync. Vagrant managed servers currently only works with cygwin based rsync implementations.
+* You MUST have at least PowerShell 3 installed in order to use the SMB folder synch. If you have PowerShell
+2 installed and try to execute a folder sync, it will hang with no good error message.
 
 ### Managed Guest
 You'll need to bootstrap the target machine. The following script should get you there.

data/lib/vagrant-orchestrate/command/init.rb

@@ -25,6 +25,7 @@ module VagrantPlugins
           options[:plugins] = DEFAULT_PLUGINS
           options[:puppet_librarian_puppet] = false
           options[:puppet_hiera] = true
+          options[:git] = true
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant orchestrate init [options]"
@@ -99,6 +100,8 @@ module VagrantPlugins
               options[:environments] = list
             end
 
+            o.on("--[no-]git", "Include useful templates for working in a git repository. Default is true.")
+
             o.on("-f", "--force", "Force overwriting of files") do
               options[:force] = true
             end
@@ -116,9 +119,6 @@ module VagrantPlugins
           argv = parse_options(opts)
           return unless argv
 
-          init_puppet options
-          init_environments options
-
           options[:shell_paths] ||= options[:shell_inline] ? [] : [DEFAULT_SHELL_PATH]
           options[:winrm_username] ||= DEFAULT_WINRM_USERNAME
           options[:winrm_password] ||= DEFAULT_WINRM_PASSWORD
@@ -126,7 +126,10 @@ module VagrantPlugins
           options[:ssh_username] ||= DEFAULT_SSH_USERNAME
           options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH unless options[:ssh_password]
 
-          write_vagrant_files(options)
+          init_puppet options
+          init_environments options
+          init_vagrant_files options
+          init_git options
           @env.ui.info(I18n.t("vagrant.commands.init.success"), prefix: false)
 
           # Success, exit status 0
@@ -136,30 +139,6 @@ module VagrantPlugins
 
         private
 
-        def write_vagrant_files(options)
-          contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/Vagrantfile"),
-                                             provisioners: options[:provisioners], shell_paths: options[:shell_paths],
-                                             shell_inline: options[:shell_inline],
-                                             puppet_librarian_puppet: options[:puppet_librarian_puppet],
-                                             puppet_hiera: options[:puppet_hiera], communicator: options[:communicator],
-                                             winrm_username: options[:winrm_username],
-                                             winrm_password: options[:winrm_password],
-                                             ssh_username: options[:ssh_username], ssh_password: options[:ssh_password],
-                                             ssh_private_key_path: options[:ssh_private_key_path],
-                                             servers: options[:servers],
-                                             environments: options[:environments], creds_prompt: options[:creds_prompt]
-                                            )
-          write_file("Vagrantfile", contents, options)
-
-          contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/.vagrantplugins"),
-                                             plugins: options[:plugins]
-                                            )
-          write_file(".vagrantplugins", contents, options)
-
-          FileUtils.cp(Orchestrate.source_root.join("templates", "vagrant", "dummy.box"),
-                       File.join(@env.cwd, "dummy.box"))
-        end
-
         def init_puppet(options)
           return unless options[:provisioners].include? "puppet"
 
@@ -168,7 +147,7 @@ module VagrantPlugins
             contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
             write_file File.join("puppet", "Puppetfile"), contents, options
             FileUtils.mkdir_p(File.join(@env.cwd, "puppet", "modules"))
-            write_file(File.join(@env.cwd, "puppet", "modules", ".gitignore"), "*", options)
+            write_file(File.join(@env.cwd, "puppet", "modules", ".gitignore"), "*", options) if options[:git]
             options[:plugins] << "vagrant-librarian-puppet"
           end
 
@@ -202,6 +181,44 @@ module VagrantPlugins
           end
         end
 
+        def init_vagrant_files(options)
+          contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/Vagrantfile"),
+                                             provisioners: options[:provisioners], shell_paths: options[:shell_paths],
+                                             shell_inline: options[:shell_inline],
+                                             puppet_librarian_puppet: options[:puppet_librarian_puppet],
+                                             puppet_hiera: options[:puppet_hiera], communicator: options[:communicator],
+                                             winrm_username: options[:winrm_username],
+                                             winrm_password: options[:winrm_password],
+                                             ssh_username: options[:ssh_username], ssh_password: options[:ssh_password],
+                                             ssh_private_key_path: options[:ssh_private_key_path],
+                                             servers: options[:servers],
+                                             environments: options[:environments], creds_prompt: options[:creds_prompt]
+                                            )
+          write_file("Vagrantfile", contents, options)
+
+          contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/.vagrantplugins"),
+                                             plugins: options[:plugins]
+                                            )
+          write_file(".vagrantplugins", contents, options)
+
+          FileUtils.cp(Orchestrate.source_root.join("templates", "vagrant", "dummy.box"),
+                       File.join(@env.cwd, "dummy.box"))
+        end
+
+        def init_git(options)
+          return unless options[:git]
+
+          gitignore_path = File.join(@env.cwd, ".gitignore")
+          contents = ::IO.readlines(gitignore_path) if File.exist?(gitignore_path)
+          contents ||= []
+
+          open(gitignore_path, "a") do |f|
+            %w( .vagrant/ ).each do |path|
+              f.puts path unless contents.include?(path + "\n")
+            end
+          end
+        end
+
         def write_file(filename, contents, options)
           save_path = Pathname.new(filename).expand_path(@env.cwd)
           save_path.delete if save_path.exist? && options[:force]

data/lib/vagrant-orchestrate/plugin.rb

@@ -85,8 +85,8 @@ module VagrantPlugins
 
       def self.read_git_branch
         @logger.debug("Reading git branch")
-        if ENV["GIT_BRANCH"]
-          git_branch = ENV["GIT_BRANCH"]
+        if ENV.key?("GIT_BRANCH")
+          git_branch = ENV["GIT_BRANCH"].split("/").last
           @logger.debug("Read git branch #{git_branch} from GIT_BRANCH environment variable")
         else
           command = "git rev-parse --abbrev-ref HEAD 2>&1"

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.6.3"
+    VERSION = "0.6.5"
   end
 end

data/spec/vagrant-orchestrate/command/init_spec.rb

@@ -307,6 +307,21 @@ describe VagrantPlugins::Orchestrate::Command::Init do
     end
   end
 
+  context "git" do
+    describe ".gitignore" do
+      it "is written" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include(".gitignore")
+      end
+
+      it "contains ignored paths" do
+        subject.execute
+        contents = File.readlines(File.join(iso_env.cwd, ".gitignore")).join
+        expect(contents).to include(".vagrant/")
+      end
+    end
+  end
+
   context "box" do
     describe "dummy.box" do
       it "winds up in the target directory" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler