github_heroku_deployer 0.0.3 → 0.0.4

data/lib/github_heroku_deployer/configuration.rb

@@ -1,6 +1,7 @@
 module GithubHerokuDeployer
   class Configuration
     OPTIONS = {
+      github_private_key: ENV["GITHUB_PRIVATE_KEY"],
       github_repo: ENV["GITHUB_REPO"],
       heroku_api_key: ENV["HEROKU_API_KEY"],
       heroku_app_name: ENV["HEROKU_APP_NAME"],

data/lib/github_heroku_deployer/git.rb

@@ -8,10 +8,11 @@ module GithubHerokuDeployer
       @ssh_enabled = options[:ssh_enabled]
       @heroku_repo = options[:heroku_repo]
       @github_repo = options[:github_repo]
+      @private_key = options[:github_private_key]
     end
 
     def push_app_to_heroku(remote="heroku", branch="master")
-      wrapper = GitSSHWrapper.new(private_key_path: "~/.ssh/id_rsa")
+      wrapper = ssh_wrapper
       repo.add_remote("heroku", @heroku_repo) unless repo.remote("heroku").url
       `cd #{repo.dir}; env #{wrapper.git_ssh} git push -f #{remote} #{branch}`
     ensure
@@ -54,7 +55,7 @@ module GithubHerokuDeployer
     def pull
       wrapper = ssh_wrapper
       dir = Dir.pwd # need to cd back to here
-      `cd #{folder}; env #{wrapper.git_ssh} git pull; cd #{dir}`
+      `cd #{dir}/#{folder}; env #{wrapper.git_ssh} git pull; cd #{dir}`
     ensure
       wrapper.unlink
     end
@@ -64,17 +65,13 @@ module GithubHerokuDeployer
     end
 
     def ssh_wrapper
-      # GitSSHWrapper.new(private_key_path: "~/.ssh/id_rsa")
       GitSSHWrapper.new(private_key_path: private_key_path)
     end
 
-    def private_key
-      @private_key ||= ENV["GITHUB_PRIVATE_KEY"]
-    end
-
     def private_key_path
-      file = Tempfile.new("github_rsa")
-      file.write(private_key)
+      file = Tempfile.new("id_rsa")
+      file.write(@private_key)
+      file.rewind
       file.path
     end
   end

data/lib/github_heroku_deployer/version.rb

@@ -1,3 +1,3 @@
 module GithubHerokuDeployer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -160,18 +160,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4513785634519590180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4513785634519590180
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24