omg_pull_request 0.1.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omg_pull_request (0.1.0)
+    omg_pull_request (0.2.1)
       activesupport (>= 3.2.6)
       aws-s3 (>= 0.6.3)
       faraday (>= 0.8.4)
@@ -32,7 +32,7 @@ GEM
       oauth2
     hashie (1.2.0)
     httpauth (0.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     jwt (0.1.5)
       multi_json (>= 1.0)
     macaddr (1.6.1)
@@ -40,7 +40,7 @@ GEM
     metaclass (0.0.1)
     mime-types (1.19)
     minitest (3.3.0)
-    mocha (0.11.4)
+    mocha (0.12.3)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     multipart-post (1.1.5)

data/bin/omg_pull_request

@@ -3,11 +3,13 @@
 require 'omg_pull_request'
 
 include OmgPullRequest
+
 locale_dir = File.expand_path("../../locales", __FILE__)
+configuration = Configuration.new
 I18n.load_path = [
   File.join(locale_dir, "omg.yml"),
   File.join(locale_dir, "en.yml")
 ]
-I18n.locale = CONFIGURATION.locale if CONFIGURATION.locale
+I18n.locale = configuration.locale if configuration.locale
 
-TestRunner.start_daemon
+TestRunner.start_daemon(configuration)

data/lib/omg_pull_request.rb

@@ -25,12 +25,5 @@ require 'omg_pull_request/lolcommits'
 require 'omg_pull_request/version'
 
 module OmgPullRequest
-  CONFIGURATION     = Configuration.new
-  CONTEXT           = Context.new
-  GITHUB_WRAPPER    = GithubWrapper.new(:configuration => CONFIGURATION)
-
-  STORE             = CONFIGURATION.storage_class.new(:configuration => CONFIGURATION,
-    :github_wrapper => GITHUB_WRAPPER)
+  CONTEXT = Context.new
 end
-
-

data/lib/omg_pull_request/configuration.rb

@@ -1,13 +1,13 @@
 module OmgPullRequest
   class Configuration
-    attr_accessor   :config
+    attr_accessor :config, :local_repo
 
     def initialize(attributes={})
       attributes.each do |attr, value|
         self.send("#{attr}=", value)
       end
 
-      if File.exists?(self.config_file)
+      if config.blank? && File.exists?(self.config_file)
         @config = YAML.load(File.open(self.config_file))
       end
     end
@@ -21,7 +21,7 @@ module OmgPullRequest
     end
 
     def local_repo
-      self.config['local_repo'] || Dir.pwd
+      @local_repo ||= ((self.config || Hash.new)['local_repo'] || Dir.pwd)
     end
 
     def database_yml
@@ -38,7 +38,7 @@ module OmgPullRequest
     end
 
     def omg_dir
-      File.join(Dir.pwd, 'test/omg_pull_request')
+      File.join(local_repo, 'test/omg_pull_request')
     end
 
     def runner_class

data/lib/omg_pull_request/notifications.rb

@@ -46,7 +46,7 @@ module OmgPullRequest
     end
 
     def github_comment(message)
-      GITHUB_WRAPPER.make_comment(self.issue_number, message)
+      self.github_wrapper.make_comment(self.issue_number, message)
     end
 
     def runner_hash(also=Hash.new)

data/lib/omg_pull_request/test_runner.rb

@@ -1,10 +1,25 @@
 module OmgPullRequest
   module TestRunner
-    def self.start_daemon
+
+    def self.start_daemon(configuration=Configuration.new, daemonize=true)
+      github_wrapper    = GithubWrapper.new(
+        :configuration => configuration
+      )
+
+      store = configuration.storage_class.new(
+        :configuration => configuration,
+        :github_wrapper => github_wrapper
+      )
+
       while(true)
         begin
-          GITHUB_WRAPPER.pull_requests.each do |pr|
-            runner = CONFIGURATION.runner_class.new(:configuration => CONFIGURATION, :pull_request  => pr)
+          github_wrapper.pull_requests.each do |pr|
+            runner = configuration.runner_class.new(
+              :configuration  => configuration, 
+              :pull_request   => pr, 
+              :github_wrapper => github_wrapper,
+              :store          => store
+            )
             next if CONTEXT.ran?(runner.request_sha)
             CONTEXT.ran(runner.request_sha)
 
@@ -15,8 +30,10 @@ module OmgPullRequest
           puts "An Error Occured: #{ex.inspect}\n#{ex.backtrace}"
         end
 
+        return if daemonize == false
         sleep(60)
       end
     end
+
   end
 end

data/lib/omg_pull_request/test_runner/base.rb

@@ -1,7 +1,7 @@
 module OmgPullRequest
   module TestRunner
     class Base
-      attr_accessor :success, :runtime, :pull_request, :configuration
+      attr_accessor :success, :runtime, :pull_request, :configuration, :github_wrapper, :store
       include Notifications
 
       def initialize(attributes={})
@@ -27,7 +27,7 @@ module OmgPullRequest
           return
         end
 
-        Bundler.with_original_env do
+        Bundler.with_clean_env do
           setup
 
           t = Time.now
@@ -77,23 +77,23 @@ module OmgPullRequest
       end
 
       def logger
-        @logger ||= TestLogger.new(:store => STORE)
+        @logger ||= TestLogger.new(:store => self.store)
       end
 
       def prowl_client
-        @prowl_client ||= Prowl.new(:configuration => CONFIGURATION, :logger => logger, :runner => self, :github_wrapper => GITHUB_WRAPPER)
+        @prowl_client ||= Prowl.new(:configuration => self.configuration, :logger => logger, :runner => self, :github_wrapper => self.github_wrapper)
       end
 
       def lolcommits_client
-        @lolcommits ||= Lolcommits.new(:configuration => CONFIGURATION, :github_wrapper => GITHUB_WRAPPER, :runner => self, :context => CONTEXT)
+        @lolcommits ||= Lolcommits.new(:configuration => self.configuration, :github_wrapper => self.github_wrapper, :runner => self, :context => CONTEXT)
       end
 
       def git_client
-        @git_client ||= GitClient.new(:logger => logger, :configuration => CONFIGURATION)
+        @git_client ||= GitClient.new(:logger => logger, :configuration => self.configuration)
       end
 
       def notifier
-        @notifier ||= Notifier.new(:runner => self, :github_wrapper => GITHUB_WRAPPER)
+        @notifier ||= Notifier.new(:runner => self, :github_wrapper => self.configuration)
       end
 
       def log(message)

data/lib/omg_pull_request/version.rb

@@ -1,3 +1,3 @@
 module OmgPullRequest
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/test/integrations/runner_test.rb

@@ -130,11 +130,21 @@ class RunnerTest < MiniTest::Unit::TestCase
             }
         }
     }
+    config = OmgPullRequest::Configuration.new(:config => configuration)
+
+    github_wrapper = OmgPullRequest::GithubWrapper.new(
+      :configuration => config
+    )
+    store = config.storage_class.new(
+      :configuration  => config,
+      :github_wrapper => github_wrapper
+    )
 
-    OmgPullRequest::CONFIGURATION.config = configuration
     OmgPullRequest::TestRunner::Rails.new(
-      :configuration => OmgPullRequest::CONFIGURATION,
-      :pull_request  => pull_request
+      :github_wrapper => github_wrapper,
+      :configuration  => config,
+      :pull_request   => pull_request,
+      :store          => store
     )
   end
 

data/test/test_helper.rb

@@ -21,6 +21,16 @@ end
 
 FakeWeb.allow_net_connect = false
 
+MOCK_CONFIGURATION  = OmgPullRequest::Configuration.new
+MOCK_GITHUB_WRAPPER = OmgPullRequest::GithubWrapper.new(
+  :configuration => MOCK_CONFIGURATION
+)
+
+MOCK_STORE = MOCK_CONFIGURATION.storage_class.new(
+  :configuration  => MOCK_CONFIGURATION,
+  :github_wrapper => MOCK_GITHUB_WRAPPER
+)
+
 def fakeweb_get_pull_request_commits
   FakeWeb.register_uri(:get,
     "https://omg:pull_request@api.github.com/repos/kenmazaika/pictures/pulls/10/commits",

data/test/units/omg_pull_request/github_wrapper_test.rb

@@ -42,7 +42,7 @@ module OmgPullRequest
     protected
 
     def github_wrapper
-      @github_wrapper ||= GithubWrapper.new(:configuration => CONFIGURATION)
+      @github_wrapper ||= GithubWrapper.new(:configuration => MOCK_CONFIGURATION)
     end
   end
 

data/test/units/omg_pull_request/lolcommits_test.rb

@@ -35,7 +35,7 @@ module OmgPullRequest
     end
 
     def lolcommits_client
-      @lolcommits_client ||= Lolcommits.new(:context => CONTEXT, :github_wrapper => GITHUB_WRAPPER,
+      @lolcommits_client ||= Lolcommits.new(:context => CONTEXT, :github_wrapper => MOCK_GITHUB_WRAPPER,
         :runner => TestRunner::Base.new(:pull_request => MockPullRequest.new))
     end
   end

data/test/units/omg_pull_request/notifications_test.rb

@@ -77,6 +77,10 @@ module OmgPullRequest
   class MockRunner
     include Notifications
 
+    def github_wrapper
+      MOCK_GITHUB_WRAPPER
+    end
+
     def abbr_from_sha
       "abbr_from_sha"
     end

data/test/units/omg_pull_request/prowl_test.rb

@@ -43,9 +43,9 @@ module OmgPullRequest
     def prowl_client
       runner = TestRunner::Base.new(:pull_request => MockPullRequest.new)
       runner.expects(:git_client).returns(MockGitClient.new).at_least(0)
-      @prowl_client ||= OmgPullRequest::Prowl.new(:configuration => CONFIGURATION,
+      @prowl_client ||= OmgPullRequest::Prowl.new(:configuration => MOCK_CONFIGURATION,
         :runner => runner,
-        :github_wrapper => GITHUB_WRAPPER)
+        :github_wrapper => MOCK_GITHUB_WRAPPER)
     end
   end
 end

data/test/units/omg_pull_request/storage/gist_test.rb

@@ -12,8 +12,8 @@ module OmgPullRequest
 
       def storage
         @store ||= Gist.new(
-          :configuration => Configuration.new,
-          :github_wrapper => GITHUB_WRAPPER
+          :configuration => MOCK_CONFIGURATION,
+          :github_wrapper => MOCK_GITHUB_WRAPPER
         )
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omg_pull_request
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000Z
+date: 2012-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70246577608500 !ruby/object:Gem::Requirement
+  requirement: &70109182790380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70246577608500
+  version_requirements: *70109182790380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70246577607840 !ruby/object:Gem::Requirement
+  requirement: &70109182789880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70246577607840
+  version_requirements: *70109182789880
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &70246577605960 !ruby/object:Gem::Requirement
+  requirement: &70109182789420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70246577605960
+  version_requirements: *70109182789420
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70246577604940 !ruby/object:Gem::Requirement
+  requirement: &70109182788960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70246577604940
+  version_requirements: *70109182788960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70246577604080 !ruby/object:Gem::Requirement
+  requirement: &70109182788500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70246577604080
+  version_requirements: *70109182788500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70246577603340 !ruby/object:Gem::Requirement
+  requirement: &70109182788040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70246577603340
+  version_requirements: *70109182788040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70246577602100 !ruby/object:Gem::Requirement
+  requirement: &70109182787580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70246577602100
+  version_requirements: *70109182787580
 description: Have tests run automatically for your Github Pull Request
 email:
 - kenmazaika@gmail.com