houston-core 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3406892d3fcfe0ad9866e9dd8a498ddcd9f289d0
-  data.tar.gz: a211ccfa508c1ed3ce16de510e7f5339d8be2500
+  metadata.gz: ccdc8ca97e863eac07e91316e4df92a6058c0319
+  data.tar.gz: cf508ea2d4af78899f39fb4152dafb5a371bdd14
 SHA512:
-  metadata.gz: 07845570a0d72d5477f0238c20b8d766b6543322ddcd504f94d066efa9b28751ea966943b80c0b461c4140a4e2a9ff079fced0bbf3374a80cad9bd86c4722390
-  data.tar.gz: ba178a7479bb6657c39fd1ecacbb447644929c95bdb35ff66a7ccbf6cb9b76cd8bd39077ac906def21e5bd2e65b5756038722b7ca33e0d97391d919c77841ecd
+  metadata.gz: efad3f461cf426eae2346593caa7524680b1260cd417603df9ba057deb3ef427d342d40eaa84f2e631b0432976719f1681e83b67c167314ce3cafe486341acfd
+  data.tar.gz: 3e54190cf91f35922f34f5e21738d3ae4877e976316fa7e346bc6d8231644585c45f6554cdb47a038817e885b7ef6d690d74cddf21eba1f47ae6fc314fd86f68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.5.6)
+    houston-core (0.6.0)
       activerecord-import
       activerecord-pluck_in_batches
       addressable
@@ -10,10 +10,10 @@ PATH
       bundler
       cancan (~> 1.6.10)
       codeclimate-test-reporter (= 0.4.8)
-      coffee-rails (~> 4.0.0)
-      default_value_for (= 3.0.0.1)
-      devise (~> 3.0.0)
-      devise_invitable (~> 1.2.1)
+      coffee-rails (~> 4.1.0)
+      default_value_for (= 3.0.1)
+      devise (~> 3.5.0)
+      devise_invitable (~> 1.5.3)
       engineyard (~> 3.2.1)
       faraday (~> 0.8.10)
       faraday-http-cache (~> 1.2.2)
@@ -36,58 +36,65 @@ PATH
       premailer (~> 1.8.6)
       progressbar
       rack-utf8_sanitizer (~> 1.3.1)
-      rails (~> 4.1.13)
+      rails (~> 4.2.5)
       redcarpet (~> 3.3.2)
       rufus-scheduler (~> 3.1.7)
       rugged (~> 0.23.3)
-      sass-rails (~> 4.0.0)
+      sass-rails (~> 5.0)
       simplecov (~> 0.9.1)
       sprockets (~> 2.8)
       strongbox (~> 0.7.2)
       thor
       thread_safe (~> 0.3.5)
-      uglifier (>= 1.3.0)
+      uglifier (>= 2.7.2)
       whenever (= 0.9.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
-      arel (~> 5.0.0)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
     activerecord-import (0.10.0)
       activerecord (>= 3.0)
     activerecord-pluck_in_batches (0.1.0)
       activerecord
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
     ansi (1.5.0)
-    arel (5.0.1.20140414130214)
+    arel (6.0.3)
     bcrypt (3.1.10)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     boblail-unfuddle (0.7.0)
       activesupport
       builder
@@ -105,27 +112,29 @@ GEM
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    crack (0.4.2)
+    coffee-script-source (1.10.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     css_parser (1.3.7)
       addressable
-    default_value_for (3.0.0.1)
+    default_value_for (3.0.1)
       activerecord (>= 3.2.0, < 5.0)
-    devise (3.0.4)
-      bcrypt-ruby (~> 3.0)
+    devise (3.5.3)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise_invitable (1.2.1)
+    devise_invitable (1.5.3)
       actionmailer (>= 3.2.6, < 5)
-      devise (~> 3.0.0)
+      devise (>= 3.2.0)
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
@@ -157,18 +166,20 @@ GEM
     faraday-raise-errors (0.2.0)
       faraday
     gemoji (2.1.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     googlecharts (1.6.12)
     handlebars_assets (0.21.0)
       execjs (~> 2.0)
       multi_json (~> 1.0)
       sprockets (>= 2.0.0, < 4.0)
       tilt (~> 1.2)
-    hashdiff (0.2.2)
+    hashdiff (0.2.3)
     highline (1.6.21)
     hike (1.2.3)
-    houston-devise_ldap_authenticatable (0.7.0)
-      devise (~> 3.0.0)
-      net-ldap (~> 0.2)
+    houston-devise_ldap_authenticatable (0.7.1)
+      devise (>= 3.0.0)
+      net-ldap (~> 0.12.1)
     houston-oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
@@ -187,13 +198,15 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.13)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile (0.6.2)
-    minitest (5.8.1)
-    minitest-reporters (1.1.4)
+    minitest (5.8.3)
+    minitest-reporters (1.1.7)
       ansi
       builder
       minitest (>= 5.0)
@@ -205,7 +218,7 @@ GEM
     multipart-post (1.2.0)
     neat-rails (0.1.0)
     nested_editor_for (0.1.0)
-    net-ldap (0.12.0)
+    net-ldap (0.12.1)
     net-ssh (2.9.2)
     netrc (0.11.0)
     nokogiri (1.6.6.4)
@@ -219,12 +232,12 @@ GEM
       rack (~> 1.2)
     octokit (4.1.1)
       sawyer (~> 0.6.0, >= 0.5.3)
-    oj (2.13.1)
-    openxml-package (0.2.0)
+    oj (2.14.0)
+    openxml-package (0.2.2)
       nokogiri
       ox
       rubyzip (~> 1.1.0)
-    openxml-xlsx (0.2.0)
+    openxml-xlsx (0.2.2)
       nokogiri
       openxml-package (>= 0.2.0)
     orm_adapter (0.5.0)
@@ -242,29 +255,40 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.5)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.1)
       rack (~> 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
-      sprockets-rails (~> 2.0)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     redcarpet (3.3.3)
     ref (2.0.0)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -275,12 +299,13 @@ GEM
     rufus-scheduler (3.1.10)
     rugged (0.23.3)
     safe_yaml (1.0.4)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.20)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
@@ -305,7 +330,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
     strongbox (0.7.2)
       activerecord
-    test_after_commit (0.4.1)
+    test_after_commit (0.4.2)
       activerecord (>= 3.2)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -322,9 +347,9 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    warden (1.2.3)
+    warden (1.2.4)
       rack (>= 1.0)
-    webmock (1.22.1)
+    webmock (1.22.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/app/adapters/houston/adapters/deployment/engineyard.rb

@@ -73,6 +73,10 @@ module Houston
 
             deployment.successful = runner.call(out, err)
 
+            Houston.try({max_tries: 5, ignore: true}, exceptions_wrapping(PG::ConnectionBad)) do
+              deploy.update_attributes!(completed_at: Time.now)
+            end
+
           rescue StandardError => e
             Houston.report_exception(e)
             deployment.err << "Error encountered during deploy.\n#{e.class} #{e}\n"
@@ -80,9 +84,6 @@ module Houston
 
           ensure
             deployment.finished
-            Houston.try({max_tries: 5, ignore: true}, exceptions_wrapping(PG::ConnectionBad)) do
-              deploy.update_attributes!(completed_at: Time.now)
-            end
           end
 
           deployment.successful?

data/app/adapters/houston/adapters/version_control/git_adapter.rb

@@ -10,12 +10,16 @@ module Houston
           # ------------------------------------------------------------------------- #
 
           def errors_with_parameters(project, location)
-            location = Addressable::URI.parse(location.to_s)
-            connect_to_repo!(location, project.version_control_temp_path)
+            location = location.to_s
+            return ERROR_BLANK if location.blank?
+
+            if local_path? location
+              return ERROR_DOES_NOT_EXIST unless File.exists? location
+            else
+              return ERROR_CANT_CONNECT unless can_fetch? location
+            end
+
             {}
-          rescue Rugged::RepositoryError, Rugged::OSError, Rugged::SshError
-            Rails.logger.error "#{$!.class.name}: #{$!.message}\n  #{$!.backtrace.take(7).join("\n  ")}"
-            { git_location: ["might not be right. Houston can't seem to connect to it."] }
           end
 
           def build(project, location)
@@ -23,17 +27,19 @@ module Houston
           end
 
           def connect(location, temp_path)
-            location = Addressable::URI.parse(location.to_s)
+            location = location.to_s
             return Houston::Adapters::VersionControl::NullRepo if location.blank?
 
-            connection = connect_to_repo! location, temp_path
+            if local_path? location
+              return Houston::Adapters::VersionControl::NullRepo unless File.exists? location
+
+              return self::Repo.new(location)
+            else
+              return Houston::Adapters::VersionControl::NullRepo unless File.exists?(temp_path) || can_fetch?(location)
 
-            return self::Repo.new(connection) unless location.absolute?
-            return self::GithubRepo.new(connection, location) if /github/ === location
-            return self::RemoteRepo.new(connection, location)
-          rescue Rugged::RepositoryError, Rugged::OSError, Rugged::SshError
-            Rails.logger.warn "\e[33m[git_adapter] #{$!.class}: #{$!.message}\e[0m"
-            Houston::Adapters::VersionControl::NullRepo
+              return self::GithubRepo.new(temp_path, location) if /github/ === location
+              return self::RemoteRepo.new(temp_path, location)
+            end
           end
 
           def parameters
@@ -44,28 +50,6 @@ module Houston
 
 
 
-          def connect_to_repo!(repo_uri, temp_path)
-            git_path = get_local_path_to_repo(repo_uri, temp_path.to_s)
-            Rugged::Repository.new(git_path)
-          end
-
-          def get_local_path_to_repo(repo_uri, temp_path)
-            if repo_uri.absolute?
-              clone!(repo_uri, temp_path) unless File.exists?(temp_path)
-              temp_path
-            else
-              repo_uri.to_s
-            end
-          end
-
-          def clone!(origin_uri, local_path, async: false)
-            if async
-              Houston.async { _clone!(origin_uri, local_path, true) }
-            else
-              _clone!(origin_uri, local_path, false)
-            end
-          end
-
           def credentials
             Rugged::Credentials::SshKey.new(
               username: SSH_USERNAME,
@@ -77,18 +61,28 @@ module Houston
 
         private
 
-          def _clone!(origin_uri, local_path, async)
-            Houston.benchmark("[git:clone#{":async" if async}] #{origin_uri} => #{local_path}") do
-              Rugged::Repository.clone_at origin_uri.to_s, local_path.to_s,
-                credentials: GitAdapter.credentials,
-                bare: true
-            end
-          end
+          ERROR_BLANK = {git_location: ["is blank"]}.freeze
+          ERROR_DOES_NOT_EXIST = {git_location: ["does not exist"]}.freeze
+          ERROR_CANT_CONNECT = {git_location: ["might not be right. Houston can't seem to connect to it."]}.freeze
 
           SSH_USERNAME = "git".freeze
           SSH_PRIVATEKEY = File.expand_path("~/.ssh/id_rsa").freeze
           SSH_PUBLICKEY = File.expand_path("~/.ssh/id_rsa.pub").freeze
 
+          def local_path?(location)
+            !Addressable::URI.parse(location.to_s).absolute?
+          end
+
+          def can_fetch?(url)
+            Houston.benchmark "[git_adapter] can_fetch?(#{url})" do
+              Dir.mktmpdir do |path|
+                repo = Rugged::Repository.init_at path, :bare
+                remote = repo.remotes.create_anonymous(url)
+                remote.check_connection(:fetch, credentials: GitAdapter.credentials)
+              end
+            end
+          end
+
         end
       end
     end