vanagon 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db5e799055a41530a8526f5b169598bd3d158f01
-  data.tar.gz: 541a9c6a444f670d0101b191cb6511108429d782
+  metadata.gz: 8b0e96f27593b42424b55cc7ba76070664a735c8
+  data.tar.gz: 47a0c3146160d374f6879e1b8a9c71f0aaf72215
 SHA512:
-  metadata.gz: 6782736f6b1733dab4b193dc3f1364591c41c5d5681e415f6f9b32d9fc6553ab59b18bce081ec90e7e960e2f65e50d0c7a2c3cd18bc9fd88907ad63fd1b09bd7
-  data.tar.gz: 622a7d7b4b5060eb1ccfc5ba0b5e4d9b5128e5a34b665868a090d312280d79bb546ba243a091efbeba3a4599abb6300275750f4c8807a49e6e0ce7e0d294797e
+  metadata.gz: c17032026ae9f33b3c82126210e8db967068156a4ba3c348c6590fb88b44905b30e23a75f55d17da31ae4e5bd7e87c16718d9c7d9a6e2987f1d50130c0fe9860
+  data.tar.gz: 434b37c3e194ade303bdb2402fcc201f23cdf1a5316f723b2fa573506aa624178bfbb7a8c05ee3595c312436fc607ad3f213c67f7dc49176cd34a80045faffe8

data/lib/vanagon/component/dsl.rb

@@ -226,9 +226,18 @@ class Vanagon
       # @param target [String] path to the desired target of the file
       # @param owner  [String] owner of the file
       # @param group  [String] group owner of the file
-      def install_file(source, target, mode: '0644', owner: nil, group: nil)
+      def install_file(source, target, mode: nil, owner: nil, group: nil) # rubocop:disable Metrics/AbcSize
         @component.install << "#{@component.platform.install} -d '#{File.dirname(target)}'"
         @component.install << "#{@component.platform.copy} -p '#{source}' '#{target}'"
+
+        if @component.platform.is_windows?
+          unless mode.nil? && owner.nil? && group.nil?
+            warn "You're trying to set the mode, owner, or group for windows. I don't know how to do that, ignoring!"
+          end
+        else
+          mode ||= '0644'
+          @component.install << "chmod #{mode} '#{target}'"
+        end
         @component.add_file Vanagon::Common::Pathname.file(target, mode: mode, owner: owner, group: group)
       end
 
@@ -369,7 +378,16 @@ class Vanagon
       # @param mode [String] octal mode to apply to the directory
       # @param owner [String] owner of the directory
       # @param group [String] group of the directory
-      def directory(dir, mode: nil, owner: nil, group: nil)
+      def directory(dir, mode: nil, owner: nil, group: nil) # rubocop:disable Metrics/AbcSize
+        install_flags = ['-d']
+        if @component.platform.is_windows?
+          unless mode.nil? && owner.nil? && group.nil?
+            warn "You're trying to set the mode, owner, or group for windows. I don't know how to do that, ignoring!"
+          end
+        else
+          install_flags << "-m '#{mode}'" unless mode.nil?
+        end
+        @component.install << "#{@component.platform.install} #{install_flags.join(' ')} '#{dir}'"
         @component.directories << Vanagon::Common::Pathname.new(dir, mode: mode, owner: owner, group: group)
       end
 

data/spec/lib/vanagon/component/dsl_spec.rb

@@ -69,6 +69,7 @@ end" }
   before do
     allow(platform).to receive(:install).and_return('install')
     allow(platform).to receive(:copy).and_return('cp')
+    allow(platform).to receive(:is_windows?).and_return(false)
   end
 
   describe "#md5sum" do
@@ -576,6 +577,7 @@ end" }
       comp.install_file('thing1', 'place/to/put/thing1', owner: 'bob', group: 'timmy', mode: '0022')
       expect(comp._component.install).to include("install -d 'place/to/put'")
       expect(comp._component.install).to include("cp -p 'thing1' 'place/to/put/thing1'")
+      expect(comp._component.install).to include("chmod 0022 'place/to/put/thing1'")
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('place/to/put/thing1', mode: '0022', owner: 'bob', group: 'timmy'))
     end
   end
@@ -716,32 +718,36 @@ end" }
 
   describe '#directory' do
     it 'adds a directory with the desired path to the directory collection for the component' do
-      comp = Vanagon::Component::DSL.new('directory-test', {}, {})
+      comp = Vanagon::Component::DSL.new('directory-test', {}, platform)
       comp.directory('/a/b/c')
       expect(comp._component.directories).to include(Vanagon::Common::Pathname.new('/a/b/c'))
     end
 
     it 'adds a directory with the desired mode to the directory collection for the component' do
-      comp = Vanagon::Component::DSL.new('directory-test', {}, {})
+      comp = Vanagon::Component::DSL.new('directory-test', {}, platform)
       comp.directory('/a/b/c', mode: '0755')
+      expect(comp._component.install).to include("install -d -m '0755' '/a/b/c'")
       expect(comp._component.directories.first).to eq(Vanagon::Common::Pathname.new('/a/b/c', mode: '0755'))
     end
 
     it 'adds a directory with the desired owner to the directory collection for the component' do
-      comp = Vanagon::Component::DSL.new('directory-test', {}, {})
+      comp = Vanagon::Component::DSL.new('directory-test', {}, platform)
       comp.directory('/a/b/c', owner: 'olivia')
+      expect(comp._component.install).to include("install -d '/a/b/c'")
       expect(comp._component.directories.first).to eq(Vanagon::Common::Pathname.new('/a/b/c', owner: 'olivia'))
     end
 
     it 'adds a directory with the desired group to the directory collection for the component' do
-      comp = Vanagon::Component::DSL.new('directory-test', {}, {})
+      comp = Vanagon::Component::DSL.new('directory-test', {}, platform)
       comp.directory('/a/b/c', group: 'release-engineering')
+      expect(comp._component.install).to include("install -d '/a/b/c'")
       expect(comp._component.directories.first).to eq(Vanagon::Common::Pathname.new('/a/b/c', group: 'release-engineering'))
     end
 
     it 'adds a directory with the desired attributes to the directory collection for the component' do
-      comp = Vanagon::Component::DSL.new('directory-test', {}, {})
+      comp = Vanagon::Component::DSL.new('directory-test', {}, platform)
       comp.directory('/a/b/c', mode: '0400', owner: 'olivia', group: 'release-engineering')
+      expect(comp._component.install).to include("install -d -m '0400' '/a/b/c'")
       expect(comp._component.directories.first).to eq(Vanagon::Common::Pathname.new('/a/b/c', mode: '0400', owner: 'olivia', group: 'release-engineering'))
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.