poise-application-git 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f9adac77390f39ac06e547c1f9d6c5ade40d5b
-  data.tar.gz: 187f54314b040338f8ad3d139837bf4fc4c9da16
+  metadata.gz: 664a831ed6f3cedcb01487ceffc2c5ff5bd2afe6
+  data.tar.gz: 8bb88912c20ee52799436ce33613ae4767d9d4a5
 SHA512:
-  metadata.gz: 7c4bc8942dfcc04257a896a660a036f58ad3285b7645022d92df8981c36cc8d1a62ab3627cb49997850d92c392b1413da1c0b3a1c63714bfb8b56c1cc60709d7
-  data.tar.gz: f3d01045634d7f4ca74f8651b2af1b6e60c5d4d7d947adf340c913681fd62b132c9bf2f4745a97461c0690aa452a36cde454745bf475914880d1844f1bb91b0c
+  metadata.gz: 5c836d81f50d027f1be9c97be8129cb3c7fbcbccf57c94c388a4bc90682b443b0decbd5a16f082095a4a7085e1e28c76597a4422c71f8ec5ed01a06b0debf41d
+  data.tar.gz: 3b8641f6ce99dae380585efbfa3fcca3aa9ac2f0b7cd892ae3d2a9162c94104bd81ef6bb7d190defa40de8d60c7f62bc0034464c9246e2b381954041bb751e19

data/.travis.yml

@@ -1,29 +1,62 @@
----
 sudo: false
 cache: bundler
 language: ruby
-rvm:
-- '2.2'
-addons:
-  apt:
-    packages:
-    - libgecode-dev
 env:
   global:
-  - USE_SYSTEM_GECODE=true
-  - secure: AtUneb2rU3NtqZH3LULBSib7x/wgGpj6k4N6LZGwkAa6HztKI0tcV/OhKw90SlwhUDKTfYtH9ZMDEi5xfy53tCjL8iaRJsQsq6cs+UxRYQRtecHynJaiNjcxNfH2sKcDBcYRDXYJ/6TAG2PPa3jnXGdhv5sqOAKWeiKBUSIil1M=
-  - secure: IaXKhWRDmQ6o5a9iefVdoUgQedy4c4Tvr+/v3WxXPcZi92h2mqObJ3JGgvoznaRXn8PKeQfhYdmPT1JS4fAJJ7cHWTxIAY1xqxqu2FJzdjFV9+SyA57r1UrNNaqRvS9Uz3BGRAb1Uy0zcBSPUXJzbhOwmiPr2qLVbFy2hfKHY3g=
-  - secure: CavdSArLFhILYs0HGT0aIQIo7HjswATbIo6M1RDCF7fLPueWR1JtJQRcBlBkR+dR3irmyN+35HieKa4TbQJPm33oPuCHgNvPJFAosyjOh9ifwxXfiMwaBZpmdzAJ1tx3w2XFQlCpIYWW5Re8qeayP8ks2nFEIZw2GROgtYsVxzM=
-bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
+    - secure: AtUneb2rU3NtqZH3LULBSib7x/wgGpj6k4N6LZGwkAa6HztKI0tcV/OhKw90SlwhUDKTfYtH9ZMDEi5xfy53tCjL8iaRJsQsq6cs+UxRYQRtecHynJaiNjcxNfH2sKcDBcYRDXYJ/6TAG2PPa3jnXGdhv5sqOAKWeiKBUSIil1M=
+    - secure: IaXKhWRDmQ6o5a9iefVdoUgQedy4c4Tvr+/v3WxXPcZi92h2mqObJ3JGgvoznaRXn8PKeQfhYdmPT1JS4fAJJ7cHWTxIAY1xqxqu2FJzdjFV9+SyA57r1UrNNaqRvS9Uz3BGRAb1Uy0zcBSPUXJzbhOwmiPr2qLVbFy2hfKHY3g=
+    - secure: CavdSArLFhILYs0HGT0aIQIo7HjswATbIo6M1RDCF7fLPueWR1JtJQRcBlBkR+dR3irmyN+35HieKa4TbQJPm33oPuCHgNvPJFAosyjOh9ifwxXfiMwaBZpmdzAJ1tx3w2XFQlCpIYWW5Re8qeayP8ks2nFEIZw2GROgtYsVxzM=
+before_install:
+  - 'if [[ $BUNDLE_GEMFILE == *master.gemfile ]]; then gem update --system; fi'
+  - gem --version
+  - gem install bundler
+  - bundle --version
+  - 'bundle config --local path ${BUNDLE_PATH:-$(dirname $BUNDLE_GEMFILE)/vendor/bundle}'
+  - bundle config --local bin $PWD/bin
+install: bundle update --jobs=3 --retry=3
 script:
-- "./bin/rake travis"
-gemfile:
-- test/gemfiles/chef-12.gemfile
-- test/gemfiles/chef-12.0.gemfile
-- test/gemfiles/chef-12.1.gemfile
-- test/gemfiles/chef-12.2.gemfile
-- test/gemfiles/chef-12.3.gemfile
-- test/gemfiles/chef-12.4.gemfile
-- test/gemfiles/chef-12.5.gemfile
-- test/gemfiles/chef-12.6.gemfile
-- test/gemfiles/master.gemfile
+  - ./bin/rake travis
+matrix:
+  include:
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.1.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.2.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.3.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.4.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.5.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.6.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.7.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.8.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.9.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.10.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.11.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.12.gemfile
+    - rvm: 2.1.9
+      gemfile: test/gemfiles/chef-12.13.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.14.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.15.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.16.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.17.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.18.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.19.gemfile
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Application_Git Changelog
 
+## v1.2.0
+
+* Major refactor on top of poise-git but should be invisible to users.
+
 ## v1.1.0
 
 * [#2](https://github.com/poise/application_git/issues/2) – Inherit user and group values from the parent `application` resource.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ dev_gem 'halite'
 dev_gem 'poise'
 dev_gem 'poise-application', path: '../application'
 dev_gem 'poise-boiler'
+dev_gem 'poise-git'
+dev_gem 'poise-languages'
 dev_gem 'poise-profiler'
 dev_gem 'poise-service'
-

data/README.md

@@ -24,7 +24,7 @@ end
 
 ## Requirements
 
-Chef 12 or newer is required.
+Chef 12.1 or newer is required.
 
 ## Resources
 
@@ -93,7 +93,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2015-2016, Noah Kantrowitz
+Copyright 2015-2017, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise-application-git.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_application_git.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_application_git/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_application_git/resource.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +14,8 @@
 # limitations under the License.
 #
 
-require 'zlib'
-
-require 'chef/provider'
-require 'chef/resource'
+require 'poise_git/resources/poise_git'
 require 'poise_application/app_mixin'
-require 'poise_application/resources/application'
-
-require 'poise_application_git/safe_string'
 
 
 module PoiseApplicationGit
@@ -38,9 +32,10 @@ module PoiseApplicationGit
   #       deploy_key data_bag_item('deploy_keys', 'myapp')['key']
   #     end
   #   end
-  class Resource < Chef::Resource::Git
+  class Resource < PoiseGit::Resources::PoiseGit::Resource
     include PoiseApplication::AppMixin
     provides(:application_git)
+    subclass_providers!
 
     # @api private
     def initialize(*args)
@@ -48,8 +43,7 @@ module PoiseApplicationGit
       # Because the superclass declares this, we have to as well. Should be
       # removable at some point when Chef makes everything use the provider
       # resolver system instead.
-      @resource_name = :application_git
-      @provider = PoiseApplicationGit::Provider
+      @resource_name = :application_git if defined?(@resource_name) && @resource_name
       # Clear defaults in older versions of Chef.
       remove_instance_variable(:@group) if instance_variable_defined?(:@group)
       remove_instance_variable(:@user) if instance_variable_defined?(:@user)
@@ -59,10 +53,7 @@ module PoiseApplicationGit
     #   Group to run git as. Defaults to the application group.
     #   @return [String, Integer, nil, false]
     attribute(:group, kind_of: [String, Integer, NilClass, FalseClass], default: lazy { parent && parent.group })
-    # @!attribute strict_ssh
-    #   Enable strict SSH host key checking. Defaults to false.
-    #   @return [Boolean]
-    attribute(:strict_ssh, equal_to: [true, false], default: false)
+
     # @!attribute user
     #   User to run git as. Defaults to the application owner.
     #   @return [String, Integer, nil, false]
@@ -75,130 +66,9 @@ module PoiseApplicationGit
         destination(parent.path)
         repository(name)
       end
-    end
-
-    # @!attribute deploy_key
-    #   SSH deploy key as either a string value or a path to a key file.
-    #   @return [String]
-    def deploy_key(val=nil)
-      # Use a SafeString for literal deploy keys so they aren't shown.
-      val = SafeString.new(val) if val && !deploy_key_is_local?(val)
-      set_or_return(:deploy_key, val, kind_of: String)
-    end
-
-    # Default SSH wrapper path.
-    #
-    # @api private
-    # @return [String]
-    def ssh_wrapper_path
-      @ssh_wrapper_path ||= ::File.expand_path("~#{user}/.ssh/ssh_wrapper_#{Zlib.crc32(name)}")
-    end
-
-    # Guess if the deploy key is a local path or literal value.
-    #
-    # @api private
-    # @param key [String, nil] Key value to check. Defaults to self.key.
-    # @return [Boolean]
-    def deploy_key_is_local?(key=nil)
-      key ||= deploy_key
-      key && key[0] == '/'
-    end
-
-    # Path to deploy key.
-    #
-    # @api private
-    # @return [String]
-    def deploy_key_path
-      @deploy_key_path ||= if deploy_key_is_local?
-        deploy_key
-      else
-        ::File.expand_path("~#{user}/.ssh/id_deploy_#{Zlib.crc32(name)}")
-      end
-    end
-  end
-
-  # Provider for `application_git`.
-  #
-  # @since 1.0.0
-  # @see Resource
-  # @provides application_git
-  class Provider < Chef::Provider::Git
-    include PoiseApplication::AppMixin
-    provides(:application_git)
-
-    # @api private
-    def initialize(*args)
       super
-      # Set the SSH wrapper path in a late-binding kind of way. This better
-      # supports situations where the user doesn't exist until Chef converges.
-      new_resource.ssh_wrapper(new_resource.ssh_wrapper_path) if new_resource.deploy_key
-    end
-
-    # @api private
-    def whyrun_supported?
-      false # Just not dealing with this right now
-    end
-
-    # Hack our special login in before load_current_resource runs because that
-    # needs access to the git remote.
-    #
-    # @api private
-    def load_current_resource
-      include_recipe('git')
-      notifying_block do
-        create_dotssh
-        write_deploy_key
-        write_ssh_wrapper
-      end if new_resource.deploy_key
-      super
-    end
-
-    private
-
-    # Create a .ssh folder for the user.
-    #
-    # @return [void]
-    def create_dotssh
-      directory ::File.expand_path("~#{new_resource.user}/.ssh") do
-        owner new_resource.user
-        group new_resource.group
-        mode '755'
-      end
-    end
-
-    # Copy the deploy key to a file if needed.
-    #
-    # @return [void]
-    def write_deploy_key
-      # Check if we have a local path or some actual content
-      return if new_resource.deploy_key_is_local?
-      file new_resource.deploy_key_path do
-        owner new_resource.user
-        group new_resource.group
-        mode '600'
-        content new_resource.deploy_key
-        sensitive true
-      end
     end
 
-    # Create the SSH wrapper script.
-    #
-    # @return [void]
-    def write_ssh_wrapper
-      # Write out the GIT_SSH script, it should already be enabled above
-      file new_resource.ssh_wrapper_path do
-        owner new_resource.user
-        group new_resource.group
-        mode '700'
-        content %Q{#!/bin/sh\n/usr/bin/env ssh #{'-o "StrictHostKeyChecking=no" ' unless new_resource.strict_ssh}-i "#{new_resource.deploy_key_path}" $@\n}
-      end
-    end
-
-    # Patch back in the `#git` from the git provider. This otherwise conflicts
-    # with the `#git` defined by the DSL, which gets included in such a way
-    # that the DSL takes priority.
-    def git(*args, &block)
-      Chef::Provider::Git.instance_method(:git).bind(self).call(*args, &block)
-    end
   end
+
 end

data/lib/poise_application_git/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 
 module PoiseApplicationGit
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/poise-application-git.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,12 +34,11 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w{lib}
 
+  spec.add_dependency 'chef', '>= 12.1', '< 14'
   spec.add_dependency 'halite', '~> 1.0'
   spec.add_dependency 'poise', '~> 2.0'
   spec.add_dependency 'poise-application', '~> 5.0'
+  spec.add_dependency 'poise-git', '~> 1.0'
 
-  spec.add_development_dependency 'berkshelf', '~> 4.0'
   spec.add_development_dependency 'poise-boiler', '~> 1.6'
-
-  spec.metadata['halite_dependencies'] = 'git'
 end

data/test/cookbook/metadata.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/cookbook/recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/gemfiles/chef-12.1.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.1.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/{lib/poise_application_git/safe_string.rb → test/gemfiles/chef-12.10.gemfile}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,12 +14,10 @@
 # limitations under the License.
 #
 
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-module PoiseApplicationGit
-  # A string that won't be shown in Chef error output
-  class SafeString < String
-    def to_text
-      '"suppressed sensitive value"'
-    end
-  end
-end
+gem 'chef', '~> 12.10.24'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.11.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.11.18'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.12.gemfile

@@ -0,0 +1,22 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.12.15'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.13.gemfile

@@ -0,0 +1,22 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.13.37'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.14.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.14.89'

data/test/gemfiles/chef-12.15.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.15.19'

data/test/gemfiles/chef-12.16.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.16.42'

data/test/gemfiles/chef-12.17.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.17.44'

data/test/gemfiles/{chef-12.0.gemfile → chef-12.18.gemfile}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.0.3'
+gem 'chef', '~> 12.18.31'

data/{Berksfile → test/gemfiles/chef-12.19.gemfile}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-source 'https://supermarket.chef.io/'
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-cookbook 'git'
+gem 'chef', '~> 12.19.36'

data/test/gemfiles/chef-12.2.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.2.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.3.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.3.0'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.4.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,5 +17,8 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.4.3'
-# Pending https://github.com/berkshelf/ridley/pull/335
-gem 'ridley', '4.4.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'
+gem 'gh', '0.14.0'

data/test/gemfiles/chef-12.5.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.5.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.6.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.6.0'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.7.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.7.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.8.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.8.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.9.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.9.41'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.0'
+gem 'chef', '~> 12.19'

data/test/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,10 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
+gem 'ohai', github: 'chef/ohai'
 gem 'poise', github: 'poise/poise'
 gem 'poise-application', github: 'poise/application'
 gem 'poise-boiler', github: 'poise/poise-boiler'
+gem 'poise-git', github: 'poise/poise-git'
+gem 'poise-languages', github: 'poise/poise-languages'
 gem 'poise-service', github: 'poise/poise-service'

data/test/integration/default/serverspec/default_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/resource_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,57 +18,35 @@ require 'spec_helper'
 
 describe PoiseApplicationGit::Resource do
   step_into(:application_git)
-  recipe do
-    application_git '/test' do
-      user 'root'
-      repository 'https://example.com/test.git'
-      revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
-      deploy_key 'secretkey'
-    end
-  end
-
   before do
-    # Don't actually run the real thing
-    allow_any_instance_of(PoiseApplicationGit::Provider).to receive(:action_sync).and_return(nil)
-    allow_any_instance_of(PoiseApplicationGit::Provider).to receive(:include_recipe).with('git').and_return(nil)
-    # Unwrap notifying_block
-    allow_any_instance_of(PoiseApplicationGit::Provider).to receive(:notifying_block) {|&block| block.call }
+    # Don't actually run the real thing, this is awkward as hell but sigh.
+    allow_any_instance_of(PoiseGit::Resources::PoiseGit::Provider).to receive(:action_sync).and_return(nil)
   end
 
-  it { is_expected.to sync_application_git('/test').with(repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed', deploy_key: 'secretkey', ssh_wrapper: File.expand_path('~root/.ssh/ssh_wrapper_2089348824')) }
-  it { is_expected.to render_file(File.expand_path('~root/.ssh/id_deploy_2089348824')).with_content('secretkey') }
-  it { is_expected.to render_file(File.expand_path('~root/.ssh/ssh_wrapper_2089348824')).with_content(%Q{#!/bin/sh\n/usr/bin/env ssh -o "StrictHostKeyChecking=no" -i "#{File.expand_path('~root/.ssh/id_deploy_2089348824')}" $@\n}) }
-
-  context 'with a local path to a deploy key' do
+  context 'with basic usage' do
     recipe do
       application_git '/test' do
-        user 'root'
         repository 'https://example.com/test.git'
         revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
-        deploy_key '/etc/key'
+        deploy_key 'secretkey'
       end
     end
 
-    it { is_expected.to sync_application_git('/test').with(repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed', deploy_key: '/etc/key', ssh_wrapper: File.expand_path('~root/.ssh/ssh_wrapper_2089348824')) }
-    it { is_expected.to render_file(File.expand_path('~root/.ssh/ssh_wrapper_2089348824')).with_content(%Q{#!/bin/sh\n/usr/bin/env ssh -o "StrictHostKeyChecking=no" -i "/etc/key" $@\n}) }
-    it { expect(chef_run.application_git('/test').to_text).to include 'deploy_key "/etc/key"' }
-  end # /context with a local path to a deploy key
+    it { is_expected.to sync_application_git('/test').with(destination: '/test', repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed', deploy_key: 'secretkey') }
+  end # /context with basic usage
+
 
-  context 'with strict SSH' do
+  context 'with a local path to a deploy key' do
     recipe do
       application_git '/test' do
-        user 'root'
         repository 'https://example.com/test.git'
         revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
-        deploy_key 'secretkey'
-        strict_ssh true
+        deploy_key '/etc/key'
       end
     end
 
-    it { is_expected.to sync_application_git('/test').with(repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed', deploy_key: 'secretkey', ssh_wrapper: File.expand_path('~root/.ssh/ssh_wrapper_2089348824')) }
-    it { is_expected.to render_file(File.expand_path('~root/.ssh/ssh_wrapper_2089348824')).with_content(%Q{#!/bin/sh\n/usr/bin/env ssh -i "#{File.expand_path('~root/.ssh/id_deploy_2089348824')}" $@\n}) }
-    it { expect(chef_run.application_git('/test').to_text).to include 'deploy_key "suppressed sensitive value"' }
-  end # /context with strict SSH
+    it { is_expected.to sync_application_git('/test').with(destination: '/test', repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed', deploy_key: '/etc/key') }
+  end # /context with a local path to a deploy key
 
   context 'with an application path' do
     recipe do
@@ -82,27 +60,14 @@ describe PoiseApplicationGit::Resource do
     it { is_expected.to sync_application_git('https://example.com/test.git').with(destination: '/app', repository: 'https://example.com/test.git', revision: 'd44ec06d0b2a87732e91c005ed2048c824fd63ed') }
   end # /context with an application path
 
-  context 'with a short name' do
-    before do
-      expect_any_instance_of(PoiseApplicationGit::Provider).to receive(:remote_resolve_reference) {|instance| instance.new_resource.revision }
-    end
-    recipe do
-      application '/app' do
-        application_git 'https://example.com/test.git'
-      end
-    end
-
-    it { is_expected.to sync_application_git('https://example.com/test.git').with(destination: '/app', repository: 'https://example.com/test.git', revision: 'HEAD') }
-  end # /context with a short name
 
   context 'with an application owner' do
-    before do
-      expect_any_instance_of(PoiseApplicationGit::Provider).to receive(:remote_resolve_reference) {|instance| instance.new_resource.revision }
-    end
     recipe do
       application '/app' do
         owner 'myuser'
-        application_git 'https://example.com/test.git'
+        application_git 'https://example.com/test.git' do
+          revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
+        end
       end
     end
 
@@ -110,31 +75,15 @@ describe PoiseApplicationGit::Resource do
   end # /context with an application owner
 
   context 'with an application group' do
-    before do
-      expect_any_instance_of(PoiseApplicationGit::Provider).to receive(:remote_resolve_reference) {|instance| instance.new_resource.revision }
-    end
     recipe do
       application '/app' do
         group 'mygroup'
-        application_git 'https://example.com/test.git'
+        application_git 'https://example.com/test.git' do
+          revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
+        end
       end
     end
 
     it { is_expected.to sync_application_git('https://example.com/test.git').with(group: 'mygroup') }
   end # /context with an application group
-
-  context 'with a user that does not exist' do
-    recipe do
-      application_git '/test' do
-        action :nothing
-        user 'notauser'
-        repository 'https://example.com/test.git'
-        revision 'd44ec06d0b2a87732e91c005ed2048c824fd63ed'
-        deploy_key 'secretkey'
-      end
-    end
-
-    # Just make sure it doesn't crash on compile.
-    it { run_chef }
-  end # /context with a user that does not exist
 end

data/test/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,3 +16,6 @@
 
 require 'poise_boiler/spec_helper'
 require 'poise_application_git'
+require 'poise_git/cheftie'
+require 'poise_application/cheftie'
+require 'poise_application_git/cheftie'

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: poise-application-git
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: halite
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: poise-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +111,6 @@ files:
 - ".kitchen.yml"
 - ".travis.yml"
 - ".yardopts"
-- Berksfile
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -102,20 +121,31 @@ files:
 - lib/poise_application_git.rb
 - lib/poise_application_git/cheftie.rb
 - lib/poise_application_git/resource.rb
-- lib/poise_application_git/safe_string.rb
 - lib/poise_application_git/version.rb
 - poise-application-git.gemspec
 - test/cookbook/metadata.rb
 - test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
-- test/gemfiles/chef-12.0.gemfile
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
@@ -126,7 +156,6 @@ licenses:
 - Apache 2.0
 metadata:
   halite_name: application_git
-  halite_dependencies: git
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -143,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A plugin for poise-application to deploy applications from git.
@@ -152,16 +181,27 @@ test_files:
 - test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
-- test/gemfiles/chef-12.0.gemfile
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/resource_spec.rb
 - test/spec/spec_helper.rb
-has_rdoc: