vagrant-tagprovision 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2426fbf2e6aad5ce46e1b3bc6f6e59a05fb5ec0
-  data.tar.gz: e7819b73c70ef1b51367df00b474161848ca1010
+  metadata.gz: 38c37be176c6d6aadd1cc4c88e65795adbe8256b
+  data.tar.gz: 77c8c9477754bc094cdbbca5af8e991d7a1ba072
 SHA512:
-  metadata.gz: 7ff905a64726fa736c749bf20807f17eb7e16aa1d79b1a86fef8fd260ee249f462df753c155577f75d7e8732afd38da1f018c63e75deb0f7d00ad8194cfc4f0e
-  data.tar.gz: a04add565f33486a176adaeab3e3df7ed457ec81deee48176954630c205418699b2b6372529286d38d08504ff3354222874157308432c3b5242a37db47b2276a
+  metadata.gz: 28765bf335c3c44f66d4f9924e8575a308dde1d064b9cd9ede2899307f66e32e3a25154c8fe7a2db668e37ce0e0301b0fbeda3527ccc568db15d799526543eca
+  data.tar.gz: 4a589dcd7fbf7b6ca606ea791ef55c9f2d1a864409c277827b9fefa7603150bcf6728e36a6f7cd2a66d7be446a8c035f2b35376b33ae494d623bfad577f99ca9

data/README.md

@@ -25,9 +25,9 @@ end
 ```
 
 config.tagprovision.enabled - This enables and disables the plugin
-config.tagprovision.log_provision - This creates an entry in /var/provision_log on the guest machine with the following format:
+config.tagprovision.log_provision - This creates an entry in /var/log/provision_log on the guest machine with the following format:
 
-2016-01-11 11:31:42 +0000	Provisioned	a41c6eb98bd069f85bc205fae24298e644a9b877	username
+2016-01-11 11:31:42 +0000	Provisioned	a41c6eb98bd069f85bc205fae24298e644a9b877	refs/tags/current_release_1.3.2
 
 config.tagprovision.tag_provision - This will create a git tag with provisioning information
 config.tagprovision.push_tag - This automatically pushes the tag to the origin your current branch is tracking
@@ -44,10 +44,18 @@ To install dependencies use:
 bundle install
 ```
 
-Then use 
+Then use:
 ```
 bundle exec vagrant provision
 ```
+
+You may need to create the guest by running:
+
+```
+bundle exec vagrant up
+```
+
+
 To test on the test VM.
 
 ### Building and deploying gem packages

data/lib/vagrant-tagprovision/action.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         @machinfo = env[:machine]
         @commit_hash = `git rev-parse HEAD`
         @commit_hash.strip!
-        @current_user = `whoami`
+        @current_tag = `git symbolic-ref -q HEAD || git describe --tags --exact-match`
         @time = Time.new
         @tag = "provisioned_#{@machine}_#{@time.year}#{@time.month}#{@time.day}#{@time.hour}#{@time.min}#{@time.sec}"
         @machine_env = @machinfo.env;
@@ -42,7 +42,7 @@ module VagrantPlugins
               if(@config.tagprovision.log_provision)
                 log_provision(env)
               end
-              if(@config.tagprovision.log_provision)
+              if(@config.tagprovision.tag_provision)
                 tag_provision(env)
               end
             end
@@ -102,7 +102,7 @@ module VagrantPlugins
       def update_file(file, resolving_machine = nil, include_id = true)
         #update the file with the current state of the vagrant config and the user provisioning
         file = Pathname.new(file)
-        file_content_line = "#{@time.inspect}\tProvisioned\t#{@commit_hash}\t#{@current_user}"
+        file_content_line = "#{@time.inspect}\tProvisioned\t#{@commit_hash}\t#{@current_tag}"
         old_file_content = file.read
         new_file_content = old_file_content + "#{file_content_line}"
         file.open('wb') { |io| io.write(new_file_content) }

data/lib/vagrant-tagprovision/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Tagprovision
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-tagprovision
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - jimrobinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - Vagrantfile

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Brett Swift
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.