zenslap 0.2.6 → 0.3.1

data/bin/zenslap

@@ -4,40 +4,62 @@ require 'rubygems'
 require 'heroku'
 require 'heroku/command'
 
-def error_out(message)
-  puts message
-  exit 1
-end
-
-def find_app
-  github_url = `git config --get remote.origin.url`
-  zenslap_id = github_url[/github.com.(.+)/, 1].gsub(/\.git$/, "")
-  error_out "Unable to find zenslap id" unless zenslap_id
-  puts "Searching for a heroku app for #{zenslap_id}"
-  heroku = Heroku::Command::Auth.new(nil).client
-  app = heroku.list.map{|a|a[0]}.find do |app|
-    heroku.config_vars(app)['ZENSLAP_GITHUB_REPOSITORY'] == zenslap_id
-  end  
-  error_out "Failed!" unless app
-  puts "Found #{app}"  
-  app
-end
-
-def retrieve_app
-  @app ||= %x{ git config zenslap.zenslap }
-end
-
-def store_app(name)
-  system "git config zenslap.zenslap #{name}"
-end
-
-def app
-  name = retrieve_app
-  if name == ""
-    name = find_app
-    store_app(name)
+module Zenslap
+  extend self
+  
+  module GitConfig
+    extend self
+    
+    def zenslap_app
+      @app ||= begin 
+        name = %x{ git config zenslap.zenslap }
+        name != "" && name
+      end
+    end
+    
+    def zenslap_app=(name)
+      system "git config zenslap.zenslap #{name}"
+      name
+    end
+    
+    def github_repository
+      @github_repository ||= begin
+        github_url = `git config --get remote.origin.url`
+        github_repository = github_url[/github.com.(.+)/, 1].gsub(/\.git$/, "")
+        error_out "Unable to find a github repository in git config" unless github_repository
+        github_repository
+      end
+    end
+    
+    private
+    def error_out(message)
+      puts message
+      exit 1
+    end
+  end
+  
+  module Heroku
+    extend self
+    
+    def find_app
+      puts "Searching for zenslap build environment on heroku"
+      app = client.list.map{|a|a[0]}.find do |app|
+        client.config_vars(app)['ZENSLAP_GITHUB_REPOSITORY'] == GitConfig.github_repository
+      end  
+      error_out "Failed!" unless app
+      puts "Found #{app}"  
+      app
+    end
+    
+    private
+    def client
+      @client ||= ::Heroku::Auth.client      
+    end
+  end
+  
+  def app
+    GitConfig.zenslap_app ||= Heroku.find_app
   end
-  name
 end
 
-exec "heroku #{ARGV.join(" ")} --app #{app}"
+exec "heroku #{ARGV.join(" ")} --app #{Zenslap.app}"

data/zenslap.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zenslap}
-  s.version = "0.2.6"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["opsb"]
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Client for zenslap continuous integration}
   s.test_files = Dir.glob("spec/**/*")  
-  s.add_dependency('heroku', ["~> 1.17.8"])
+  s.add_dependency('heroku', ["~> 2.0"])
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zenslap
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - opsb
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 67
+        hash: 3
         segments: 
-        - 1
-        - 17
-        - 8
-        version: 1.17.8
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 description: Client for zenslap continuous integration
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client for zenslap continuous integration