github_heroku_deployer 0.0.4 → 0.0.5

data/README.md

@@ -40,12 +40,13 @@ Set defaults in an initializer, defaults are shown:
 
 ```ruby
 GithubHerokuDeployer.configure do |config|
-  config.ssh             = false
   config.github_repo     = ENV["GITHUB_REPO"]
   config.heroku_api_key  = ENV["HEROKU_API_KEY"]
   config.heroku_app_name = ENV["HEROKU_APP_NAME"]
   config.heroku_repo     = ENV["HEROKU_REPO"]
   config.heroku_username = ENV["HEROKU_USERNAME"]
+  config.id_rsa          = ENV["ID_RSA"]
+  config.logger          = Logger.new(STDOUT)
 end
 ```
 
@@ -57,6 +58,7 @@ export HEROKU_API_KEY=heroku_api_key
 export HEROKU_APP_NAME=heroku_app_name
 export HEROKU_REPO=git@heroku.com:repo.git
 export HEROKU_USERNAME=heroku_username
+export ID_RSA=id_rsa
 ```
 
 Deploy:

data/lib/github_heroku_deployer/configuration.rb

@@ -1,13 +1,14 @@
 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"],
       heroku_repo: ENV["HEROKU_REPO"],
       heroku_username: ENV["HEROKU_USERNAME"],
-      ssh_enabled: false,
+      id_rsa: ENV["ID_RSA"],
+      logger: ::Logger.new(STDOUT),
+      repo_dir: ENV["REPO_DIR"]
     }
 
     # Defines accessors for all OPTIONS

data/lib/github_heroku_deployer/exceptions.rb

@@ -1,3 +1,4 @@
 module GithubHerokuDeployer
   class ConfigurationException < StandardError; end
+  class CommandException < StandardError; end
 end

data/lib/github_heroku_deployer/git.rb

@@ -5,16 +5,19 @@ module GithubHerokuDeployer
   class Git
 
     def initialize(options)
-      @ssh_enabled = options[:ssh_enabled]
       @heroku_repo = options[:heroku_repo]
       @github_repo = options[:github_repo]
-      @private_key = options[:github_private_key]
+      @id_rsa = options[:id_rsa]
+      @logger = options[:logger]
+      @repo_dir = options[:repo_dir]
     end
 
     def push_app_to_heroku(remote="heroku", branch="master")
       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}`
+      run "cd #{repo.dir}; git remote rm #{remote}" if repo.remote(remote).url
+      repo.add_remote(remote, @heroku_repo)
+      @logger.info "deploying #{repo.dir} to #{repo.remote(remote).url} from branch #{branch}"
+      run "cd #{repo.dir}; env #{wrapper.git_ssh} git push -f #{remote} #{branch}"
     ensure
       wrapper.unlink
     end
@@ -24,17 +27,18 @@ module GithubHerokuDeployer
     end
 
     def setup_repo
-      # remove_folder
       clone_or_pull
       open
     end
 
-    # def remove_folder
-    #   `rm -r #{folder}`
-    # end
-
     def folder
-      @folder ||= "repos/#{Zlib.crc32(@github_repo)}"
+      @folder ||= setup_folder
+    end
+
+    def setup_folder
+      folder = File.join(@repo_dir, Zlib.crc32(@github_repo).to_s)
+      FileUtils.mkdir_p(folder)
+      folder
     end
 
     def clone_or_pull
@@ -47,7 +51,8 @@ module GithubHerokuDeployer
 
     def clone
       wrapper = ssh_wrapper
-      `env #{wrapper.git_ssh} git clone #{@github_repo} #{folder}`
+      @logger.info "cloning #{@github_repo} to #{folder}"
+      run "env #{wrapper.git_ssh} git clone #{@github_repo} #{folder}"
     ensure
       wrapper.unlink
     end
@@ -55,7 +60,8 @@ module GithubHerokuDeployer
     def pull
       wrapper = ssh_wrapper
       dir = Dir.pwd # need to cd back to here
-      `cd #{dir}/#{folder}; env #{wrapper.git_ssh} git pull; cd #{dir}`
+      @logger.info "pulling from #{folder}"
+      run "cd #{folder}; env #{wrapper.git_ssh} git pull; cd #{dir}"
     ensure
       wrapper.unlink
     end
@@ -65,14 +71,24 @@ module GithubHerokuDeployer
     end
 
     def ssh_wrapper
-      GitSSHWrapper.new(private_key_path: private_key_path)
+      GitSSHWrapper.new(private_key_path: id_rsa_path)
     end
 
-    def private_key_path
+    def id_rsa_path
       file = Tempfile.new("id_rsa")
-      file.write(@private_key)
+      file.write(@id_rsa)
       file.rewind
       file.path
     end
+
+    def run(command)
+      result = `#{command} 2>&1`
+      status = $?.exitstatus
+      if status == 0
+        @logger.info result
+      else
+        raise GithubHerokuDeployer::CommandException, result
+      end
+    end
   end
 end

data/lib/github_heroku_deployer/heroku.rb

@@ -8,6 +8,7 @@ module GithubHerokuDeployer
       @heroku_app_name = options[:heroku_app_name]
     end
 
+
     def heroku
       @heroku ||= ::Heroku::API.new(api_key: @heroku_api_key)
     end
@@ -30,9 +31,13 @@ module GithubHerokuDeployer
       heroku.post_app(name: @heroku_app_name)
     end
 
-    # def delete_app
-    #   heroku.delete_app(@heroku_app_name)
-    # end
+    def run(command)
+      heroku.post_ps(@heroku_app_name, command)
+    end
+    
+    def delete_app
+      heroku.delete_app(@heroku_app_name)
+    end
 
     # def add_deployhooks_http(url)
     #   add_addon("deployhooks:http", url: url)
@@ -45,9 +50,5 @@ module GithubHerokuDeployer
     # def delete_addon(addon)
     #   heroku.delete_addon(@heroku_app_name, addon)
     # end
-
-    # def migrate
-    #   heroku.post_ps(@heroku_app_name, "rake db:migrate")
-    # end
   end
 end

data/lib/github_heroku_deployer/version.rb

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

data/lib/github_heroku_deployer.rb

@@ -1,3 +1,4 @@
+require "logger"
 require "github_heroku_deployer/exceptions"
 require "github_heroku_deployer/configuration"
 require "github_heroku_deployer/git"
@@ -28,7 +29,8 @@ module GithubHerokuDeployer
     #     config.heroku_app_name = ENV["HEROKU_APP_NAME"]
     #     config.heroku_repo     = ENV["HEROKU_REPO"]
     #     config.heroku_username = ENV["HEROKU_USERNAME"]
-    #     config.ssh_enabled     = false
+    #     config.id_rsa          = ENV["ID_RSA"]
+    #     config.logger          = Logger.new(STDOUT)
     #   end
     def configure
       yield(configuration)
@@ -42,6 +44,12 @@ module GithubHerokuDeployer
       true
     end
 
+    def heroku_run(command, options={})
+      options = configuration.merge(options)
+      validate_options(options)
+      Heroku.new(options).run(command)
+    end
+
     def validate_options(options)
       configuration.validate_presence(options)
     end

data/spec/lib/github_heroku_deployer_spec.rb

@@ -42,32 +42,59 @@ describe GithubHerokuDeployer do
       end
     end
 
+    # TODO: how can I test these better?
     context "when configured" do
       before :each do
         @deployer = mock("github_heroku_deployer")
         @deployer.stub!(:deploy).and_return(true)
       end
 
-      # TODO: how can I test this better?
-      it "deploys public repos" do
-        GithubHerokuDeployer.configure do |config|
-          config.github_repo = ENV["PUBLIC_GITHUB_REPO"]
+      context "when repo does not exist locally" do
+        it "deploys public repos" do
+          public_repo = ENV["PUBLIC_GITHUB_REPO"]
+          public_repo_folder = Zlib.crc32(public_repo).to_s
+          repos_dir = GithubHerokuDeployer.configuration[:repo_dir]
+          full_path = File.join(repos_dir, public_repo_folder)
+          FileUtils.rm_r(full_path) if File.exists?(full_path)
+          GithubHerokuDeployer.configure do |config|
+            config.github_repo = public_repo
+          end
+          # GithubHerokuDeployer.deploy.should be true
+          @deployer.deploy.should be true
+        end
+
+        it "deploys private repos" do
+          private_repo = ENV["PRIVATE_GITHUB_REPO"]
+          private_repo_folder = Zlib.crc32(private_repo).to_s
+          repos_dir = GithubHerokuDeployer.configuration[:repo_dir]
+          full_path = File.join(repos_dir, private_repo_folder)
+          FileUtils.rm_r(full_path) if File.exists?(full_path)
+          GithubHerokuDeployer.configure do |config|
+            config.github_repo = private_repo
+          end
+          # GithubHerokuDeployer.deploy.should be true
+          @deployer.deploy.should be true
         end
-        # GithubHerokuDeployer.deploy.should be true
-        @deployer.deploy.should be true
       end
 
-      # TODO: how can I test this better?
-      it "deploys private repos" do
-        GithubHerokuDeployer.configure do |config|
-          config.ssh_enabled = true
-          config.github_repo = ENV["PRIVATE_GITHUB_REPO"]
+      context "when repo exists locally" do
+        it "deploys public repos" do
+          GithubHerokuDeployer.configure do |config|
+            config.github_repo = ENV["PUBLIC_GITHUB_REPO"]
+          end
+          # GithubHerokuDeployer.deploy.should be true
+          @deployer.deploy.should be true
+        end
+
+        it "deploys private repos" do
+          GithubHerokuDeployer.configure do |config|
+            config.github_repo = ENV["PRIVATE_GITHUB_REPO"]
+          end
+          # GithubHerokuDeployer.deploy.should be true
+          @deployer.deploy.should be true
         end
-        # GithubHerokuDeployer.deploy.should be true
-        @deployer.deploy.should be true
       end
 
-      # TODO: how can I test this better?
       it "overrides defaults" do
         GithubHerokuDeployer.configure do |config|
           config.github_repo = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -160,12 +160,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3203415681699428382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3203415681699428382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24