{"action":"created","comment":{"url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/comments/54318961","id":54318961,"diff_hunk":"@@ -53,9 +54,54 @@ def generate_packaging_artifacts(workdir, name, binding)\n       # @param name [String] name of the project\n       # @param binding [Binding] binding to use in evaluating the packaging templates\n       def generate_msi_packaging_artifacts(workdir, name, binding)\n-        FileUtils.mkdir_p(File.join(workdir, \"wix\"))\n-        erb_file(File.join(VANAGON_ROOT, \"resources/windows/wix/project.wxs.erb\"), File.join(workdir, \"wix\",  \"#{name}.wxs\"), false, { :binding => binding })\n-        erb_file(File.join(VANAGON_ROOT, \"resources/windows/wix/project.filter.xslt.erb\"), File.join(workdir, \"wix\", \"#{name}.filter.xslt\"), false, { :binding => binding })\n+        # Copy the project specific files first\n+        copy_from_project(\"#{@proj_root}/resources/windows/wix\", workdir)\n+        merge_defaults_from_vanagon(\"#{VANAGON_ROOT}/resources/windows/wix\", \"#{workdir}/wix\")\n+        process_templates(\"#{workdir}/wix\", binding)\n+      end\n+\n+      # Method to recursively copy from a source project resource directory\n+      # to a destination (wix) work directory.\n+      # strongly suspect the original cp_r command would have done all of this.\n+      #\n+      # @param proj_resources [String] Project Resource File directory\n+      # @param destination [String] Destination directory\n+      # @param verbose [String] True or false\n+      def copy_from_project(proj_resources, destination, verbose: false)\n+        FileUtils.cp_r(proj_resources, destination, :verbose => verbose)\n+      end\n+\n+      # Method to merge in the files from the Vanagon (generic) directories.\n+      # Project Specific files take precedence, so since these are copied prior\n+      # to this function, then this merge operation will ignore existing files\n+      #\n+      # @param vanagon_root [String] Vanagon wix resources directory\n+      # @param destination [String] Destination directory\n+      # @param verbose [String] True or false\n+      def merge_defaults_from_vanagon(vanagon_root, destination, verbose: false)\n+        vanagon_path = Pathname.new(vanagon_root)\n+        files = Dir.glob(File.join(vanagon_root, \"**/*.*\"))\n+        files.each do |file|","path":"lib/vanagon/platform/windows.rb","position":42,"original_position":42,"commit_id":"79af1e03203930c66d2a818713c0ae4d00081693","original_commit_id":"6b32fc04dabf768dddcad86e361144f2768a6e73","user":{"login":"mckern","id":344926,"avatar_url":"https://avatars.githubusercontent.com/u/344926?v=3","gravatar_id":"","url":"https://api.github.com/users/mckern","html_url":"https://github.com/mckern","followers_url":"https://api.github.com/users/mckern/followers","following_url":"https://api.github.com/users/mckern/following{/other_user}","gists_url":"https://api.github.com/users/mckern/gists{/gist_id}","starred_url":"https://api.github.com/users/mckern/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mckern/subscriptions","organizations_url":"https://api.github.com/users/mckern/orgs","repos_url":"https://api.github.com/users/mckern/repos","events_url":"https://api.github.com/users/mckern/events{/privacy}","received_events_url":"https://api.github.com/users/mckern/received_events","type":"User","site_admin":false},"body":"Pick it up Monday. Saturday and Sunday are your time.","created_at":"2016-02-26T23:55:56Z","updated_at":"2016-02-26T23:55:56Z","html_url":"https://github.com/puppetlabs/vanagon/pull/288#discussion_r54318961","pull_request_url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288","_links":{"self":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/comments/54318961"},"html":{"href":"https://github.com/puppetlabs/vanagon/pull/288#discussion_r54318961"},"pull_request":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288"}}},"pull_request":{"url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288","id":59425473,"html_url":"https://github.com/puppetlabs/vanagon/pull/288","diff_url":"https://github.com/puppetlabs/vanagon/pull/288.diff","patch_url":"https://github.com/puppetlabs/vanagon/pull/288.patch","issue_url":"https://api.github.com/repos/puppetlabs/vanagon/issues/288","number":288,"state":"open","locked":false,"title":"(RE-6456) Allow vanagon to pull in project specific files","user":{"login":"jcoconnor","id":13116231,"avatar_url":"https://avatars.githubusercontent.com/u/13116231?v=3","gravatar_id":"","url":"https://api.github.com/users/jcoconnor","html_url":"https://github.com/jcoconnor","followers_url":"https://api.github.com/users/jcoconnor/followers","following_url":"https://api.github.com/users/jcoconnor/following{/other_user}","gists_url":"https://api.github.com/users/jcoconnor/gists{/gist_id}","starred_url":"https://api.github.com/users/jcoconnor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcoconnor/subscriptions","organizations_url":"https://api.github.com/users/jcoconnor/orgs","repos_url":"https://api.github.com/users/jcoconnor/repos","events_url":"https://api.github.com/users/jcoconnor/events{/privacy}","received_events_url":"https://api.github.com/users/jcoconnor/received_events","type":"User","site_admin":false},"body":"As noted in discussion, this is now focussing in RE-6456, i.e. allowing Vanagon to include project specific files as well as a generic set of wix files.\r\n\r\n/cc @melissa, @jpogran and @McdonaldSeanp ","created_at":"2016-02-15T23:30:15Z","updated_at":"2016-02-26T23:55:56Z","closed_at":null,"merged_at":null,"merge_commit_sha":"97355f46af506df5012b82005796f409c6e80eba","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288/commits","review_comments_url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288/comments","review_comment_url":"https://api.github.com/repos/puppetlabs/vanagon/pulls/comments{/number}","comments_url":"https://api.github.com/repos/puppetlabs/vanagon/issues/288/comments","statuses_url":"https://api.github.com/repos/puppetlabs/vanagon/statuses/79af1e03203930c66d2a818713c0ae4d00081693","head":{"label":"jcoconnor:ticket/master/RE-6464-Custom-Action-Breakout","ref":"ticket/master/RE-6464-Custom-Action-Breakout","sha":"79af1e03203930c66d2a818713c0ae4d00081693","user":{"login":"jcoconnor","id":13116231,"avatar_url":"https://avatars.githubusercontent.com/u/13116231?v=3","gravatar_id":"","url":"https://api.github.com/users/jcoconnor","html_url":"https://github.com/jcoconnor","followers_url":"https://api.github.com/users/jcoconnor/followers","following_url":"https://api.github.com/users/jcoconnor/following{/other_user}","gists_url":"https://api.github.com/users/jcoconnor/gists{/gist_id}","starred_url":"https://api.github.com/users/jcoconnor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcoconnor/subscriptions","organizations_url":"https://api.github.com/users/jcoconnor/orgs","repos_url":"https://api.github.com/users/jcoconnor/repos","events_url":"https://api.github.com/users/jcoconnor/events{/privacy}","received_events_url":"https://api.github.com/users/jcoconnor/received_events","type":"User","site_admin":false},"repo":{"id":44818189,"name":"vanagon","full_name":"jcoconnor/vanagon","owner":{"login":"jcoconnor","id":13116231,"avatar_url":"https://avatars.githubusercontent.com/u/13116231?v=3","gravatar_id":"","url":"https://api.github.com/users/jcoconnor","html_url":"https://github.com/jcoconnor","followers_url":"https://api.github.com/users/jcoconnor/followers","following_url":"https://api.github.com/users/jcoconnor/following{/other_user}","gists_url":"https://api.github.com/users/jcoconnor/gists{/gist_id}","starred_url":"https://api.github.com/users/jcoconnor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcoconnor/subscriptions","organizations_url":"https://api.github.com/users/jcoconnor/orgs","repos_url":"https://api.github.com/users/jcoconnor/repos","events_url":"https://api.github.com/users/jcoconnor/events{/privacy}","received_events_url":"https://api.github.com/users/jcoconnor/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jcoconnor/vanagon","description":"All of your packages will fit into this van with this one simple trick.","fork":true,"url":"https://api.github.com/repos/jcoconnor/vanagon","forks_url":"https://api.github.com/repos/jcoconnor/vanagon/forks","keys_url":"https://api.github.com/repos/jcoconnor/vanagon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jcoconnor/vanagon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jcoconnor/vanagon/teams","hooks_url":"https://api.github.com/repos/jcoconnor/vanagon/hooks","issue_events_url":"https://api.github.com/repos/jcoconnor/vanagon/issues/events{/number}","events_url":"https://api.github.com/repos/jcoconnor/vanagon/events","assignees_url":"https://api.github.com/repos/jcoconnor/vanagon/assignees{/user}","branches_url":"https://api.github.com/repos/jcoconnor/vanagon/branches{/branch}","tags_url":"https://api.github.com/repos/jcoconnor/vanagon/tags","blobs_url":"https://api.github.com/repos/jcoconnor/vanagon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jcoconnor/vanagon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jcoconnor/vanagon/git/refs{/sha}","trees_url":"https://api.github.com/repos/jcoconnor/vanagon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jcoconnor/vanagon/statuses/{sha}","languages_url":"https://api.github.com/repos/jcoconnor/vanagon/languages","stargazers_url":"https://api.github.com/repos/jcoconnor/vanagon/stargazers","contributors_url":"https://api.github.com/repos/jcoconnor/vanagon/contributors","subscribers_url":"https://api.github.com/repos/jcoconnor/vanagon/subscribers","subscription_url":"https://api.github.com/repos/jcoconnor/vanagon/subscription","commits_url":"https://api.github.com/repos/jcoconnor/vanagon/commits{/sha}","git_commits_url":"https://api.github.com/repos/jcoconnor/vanagon/git/commits{/sha}","comments_url":"https://api.github.com/repos/jcoconnor/vanagon/comments{/number}","issue_comment_url":"https://api.github.com/repos/jcoconnor/vanagon/issues/comments{/number}","contents_url":"https://api.github.com/repos/jcoconnor/vanagon/contents/{+path}","compare_url":"https://api.github.com/repos/jcoconnor/vanagon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jcoconnor/vanagon/merges","archive_url":"https://api.github.com/repos/jcoconnor/vanagon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jcoconnor/vanagon/downloads","issues_url":"https://api.github.com/repos/jcoconnor/vanagon/issues{/number}","pulls_url":"https://api.github.com/repos/jcoconnor/vanagon/pulls{/number}","milestones_url":"https://api.github.com/repos/jcoconnor/vanagon/milestones{/number}","notifications_url":"https://api.github.com/repos/jcoconnor/vanagon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jcoconnor/vanagon/labels{/name}","releases_url":"https://api.github.com/repos/jcoconnor/vanagon/releases{/id}","deployments_url":"https://api.github.com/repos/jcoconnor/vanagon/deployments","created_at":"2015-10-23T14:29:07Z","updated_at":"2016-01-27T10:46:40Z","pushed_at":"2016-02-26T23:32:05Z","git_url":"git://github.com/jcoconnor/vanagon.git","ssh_url":"git@github.com:jcoconnor/vanagon.git","clone_url":"https://github.com/jcoconnor/vanagon.git","svn_url":"https://github.com/jcoconnor/vanagon","homepage":null,"size":822,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"puppetlabs:master","ref":"master","sha":"9c802ce13cb46575028c50425fb603454dad661e","user":{"login":"puppetlabs","id":234268,"avatar_url":"https://avatars.githubusercontent.com/u/234268?v=3","gravatar_id":"","url":"https://api.github.com/users/puppetlabs","html_url":"https://github.com/puppetlabs","followers_url":"https://api.github.com/users/puppetlabs/followers","following_url":"https://api.github.com/users/puppetlabs/following{/other_user}","gists_url":"https://api.github.com/users/puppetlabs/gists{/gist_id}","starred_url":"https://api.github.com/users/puppetlabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/puppetlabs/subscriptions","organizations_url":"https://api.github.com/users/puppetlabs/orgs","repos_url":"https://api.github.com/users/puppetlabs/repos","events_url":"https://api.github.com/users/puppetlabs/events{/privacy}","received_events_url":"https://api.github.com/users/puppetlabs/received_events","type":"Organization","site_admin":false},"repo":{"id":26653553,"name":"vanagon","full_name":"puppetlabs/vanagon","owner":{"login":"puppetlabs","id":234268,"avatar_url":"https://avatars.githubusercontent.com/u/234268?v=3","gravatar_id":"","url":"https://api.github.com/users/puppetlabs","html_url":"https://github.com/puppetlabs","followers_url":"https://api.github.com/users/puppetlabs/followers","following_url":"https://api.github.com/users/puppetlabs/following{/other_user}","gists_url":"https://api.github.com/users/puppetlabs/gists{/gist_id}","starred_url":"https://api.github.com/users/puppetlabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/puppetlabs/subscriptions","organizations_url":"https://api.github.com/users/puppetlabs/orgs","repos_url":"https://api.github.com/users/puppetlabs/repos","events_url":"https://api.github.com/users/puppetlabs/events{/privacy}","received_events_url":"https://api.github.com/users/puppetlabs/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/puppetlabs/vanagon","description":"All of your packages will fit into this van with this one simple trick.","fork":false,"url":"https://api.github.com/repos/puppetlabs/vanagon","forks_url":"https://api.github.com/repos/puppetlabs/vanagon/forks","keys_url":"https://api.github.com/repos/puppetlabs/vanagon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/puppetlabs/vanagon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/puppetlabs/vanagon/teams","hooks_url":"https://api.github.com/repos/puppetlabs/vanagon/hooks","issue_events_url":"https://api.github.com/repos/puppetlabs/vanagon/issues/events{/number}","events_url":"https://api.github.com/repos/puppetlabs/vanagon/events","assignees_url":"https://api.github.com/repos/puppetlabs/vanagon/assignees{/user}","branches_url":"https://api.github.com/repos/puppetlabs/vanagon/branches{/branch}","tags_url":"https://api.github.com/repos/puppetlabs/vanagon/tags","blobs_url":"https://api.github.com/repos/puppetlabs/vanagon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/puppetlabs/vanagon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/puppetlabs/vanagon/git/refs{/sha}","trees_url":"https://api.github.com/repos/puppetlabs/vanagon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/puppetlabs/vanagon/statuses/{sha}","languages_url":"https://api.github.com/repos/puppetlabs/vanagon/languages","stargazers_url":"https://api.github.com/repos/puppetlabs/vanagon/stargazers","contributors_url":"https://api.github.com/repos/puppetlabs/vanagon/contributors","subscribers_url":"https://api.github.com/repos/puppetlabs/vanagon/subscribers","subscription_url":"https://api.github.com/repos/puppetlabs/vanagon/subscription","commits_url":"https://api.github.com/repos/puppetlabs/vanagon/commits{/sha}","git_commits_url":"https://api.github.com/repos/puppetlabs/vanagon/git/commits{/sha}","comments_url":"https://api.github.com/repos/puppetlabs/vanagon/comments{/number}","issue_comment_url":"https://api.github.com/repos/puppetlabs/vanagon/issues/comments{/number}","contents_url":"https://api.github.com/repos/puppetlabs/vanagon/contents/{+path}","compare_url":"https://api.github.com/repos/puppetlabs/vanagon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/puppetlabs/vanagon/merges","archive_url":"https://api.github.com/repos/puppetlabs/vanagon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/puppetlabs/vanagon/downloads","issues_url":"https://api.github.com/repos/puppetlabs/vanagon/issues{/number}","pulls_url":"https://api.github.com/repos/puppetlabs/vanagon/pulls{/number}","milestones_url":"https://api.github.com/repos/puppetlabs/vanagon/milestones{/number}","notifications_url":"https://api.github.com/repos/puppetlabs/vanagon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/puppetlabs/vanagon/labels{/name}","releases_url":"https://api.github.com/repos/puppetlabs/vanagon/releases{/id}","deployments_url":"https://api.github.com/repos/puppetlabs/vanagon/deployments","created_at":"2014-11-14T19:17:18Z","updated_at":"2016-01-29T12:05:09Z","pushed_at":"2016-02-26T23:32:06Z","git_url":"git://github.com/puppetlabs/vanagon.git","ssh_url":"git@github.com:puppetlabs/vanagon.git","clone_url":"https://github.com/puppetlabs/vanagon.git","svn_url":"https://github.com/puppetlabs/vanagon","homepage":null,"size":950,"stargazers_count":12,"watchers_count":12,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":19,"mirror_url":null,"open_issues_count":6,"forks":19,"open_issues":6,"watchers":12,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288"},"html":{"href":"https://github.com/puppetlabs/vanagon/pull/288"},"issue":{"href":"https://api.github.com/repos/puppetlabs/vanagon/issues/288"},"comments":{"href":"https://api.github.com/repos/puppetlabs/vanagon/issues/288/comments"},"review_comments":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288/comments"},"review_comment":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/puppetlabs/vanagon/pulls/288/commits"},"statuses":{"href":"https://api.github.com/repos/puppetlabs/vanagon/statuses/79af1e03203930c66d2a818713c0ae4d00081693"}}}}