solano 1.31.6 → 1.31.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df2d5edf725f6df979c496a3be6033cc5be58646
-  data.tar.gz: f06f60fe43fe5846c514c56dbae2476e17ba1dbf
+  metadata.gz: d80ca26cf7d8c09d1194f770207f036bdacab233
+  data.tar.gz: 3ef263c9276074e1aa0a73ad60051e16e9003139
 SHA512:
-  metadata.gz: 2f963c59351fc1e27b650d7a38010c8900f687a4abc89de53b961b8e4d66358c6a05fafed8ad7509a21fae5645b5ee2dd282ebe06cee3d07af03bbef4e82ba6e
-  data.tar.gz: 6942dc3d36bef0c085e051ed562b556f197b58c23c70a728ca5322fcd1768e634dbed35c3683247c45cf7542795cf28127ff420048ec99ea9da49386e0d8fca1
+  metadata.gz: 2101b76771c1a936815df6c57abbb0999f7ad7ea07e42bf1b9c69cac1ac80b7b0a9c6bbae83c42e275e3a051da768b1e1389b42e5b65fe57e069006984a8d1f4
+  data.tar.gz: c360452db61df018ea77feb95fee436a3f7f77a50ca6153d0fdb2461d9774106535d32562b2299676f9e765a630a7c4c995715163d3e749f0b45ba5138c99eca

data/lib/solano/cli/commands/console.rb

@@ -11,9 +11,19 @@ module Solano
     method_option :commit, :type => :string, :default => nil
     def console(*cmd)
       solano_setup({:repo => true})
-      origin = `git config --get remote.origin.url`.strip
-      session_result = @solano_api.call_api(:get, "/sessions", {:repo_url => origin})["sessions"]
-      if session_result.length > 0 then
+      origin_url = @scm.origin_url
+      current_suite_id = @solano_api.current_suite_id
+      if current_suite_id then
+        say "Checking for sessions on this branch"
+        session_result = @solano_api.call_api(:get, "/sessions", {:suite_id => current_suite_id})["sessions"]
+      elsif suite_for_default_branch? then
+        say "Checking for sessions on default branch"
+        session_result = @solano_api.call_api(:get, "/sessions", {:repo_url => origin_url})["sessions"]
+      else
+        say "Checking for sessions on this repository"
+        session_result = @solano_api.call_api(:get, "/sessions", {:repo_url => origin_url})["sessions"]
+      end
+      if defined?(session_result) && session_result.any? then
         session = session_result[0]
         session_id = session["id"]
         q_result = @solano_api.query_session(session_id).tddium_response["session"]
@@ -63,11 +73,11 @@ module Solano
           say start_result["message"]
         end
       else
-        say "Unable to find any previous sessions. Execute solano run first"
+        say "Unable to find any previous sessions. Execute solano run first or switch to a branch with a recent session."
       end
     end
 
-    private 
+    private
     # return nice string version of hrs mins secs from time delta
     def duration(d)
       secs = d.to_int

data/lib/solano/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011-2017 Solano Labs All Rights Reserved
 
 module Solano
-  VERSION = "1.31.6"
+  VERSION = "1.31.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solano
 version: !ruby/object:Gem::Version
-  version: 1.31.6
+  version: 1.31.7
 platform: ruby
 authors:
 - Solano Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor