solano 1.31.7 → 1.31.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80ca26cf7d8c09d1194f770207f036bdacab233
-  data.tar.gz: 3ef263c9276074e1aa0a73ad60051e16e9003139
+  metadata.gz: 4da4f4f8e4baaad65f0c1fb3e25ae8d4c8c0e918
+  data.tar.gz: e1e8e5945dc15ad77b3d96f0e62266e3abcf309e
 SHA512:
-  metadata.gz: 2101b76771c1a936815df6c57abbb0999f7ad7ea07e42bf1b9c69cac1ac80b7b0a9c6bbae83c42e275e3a051da768b1e1389b42e5b65fe57e069006984a8d1f4
-  data.tar.gz: c360452db61df018ea77feb95fee436a3f7f77a50ca6153d0fdb2461d9774106535d32562b2299676f9e765a630a7c4c995715163d3e749f0b45ba5138c99eca
+  metadata.gz: 6edb2b435228c1608bb27251b8181934c8c7fb81a338bd4a2bda544277edeed3e3911644385bc5092e326ea939b97e125ae2c0d1cd5b85a1aa011521427e1227
+  data.tar.gz: cd3f377c98c6e731ee7082c4b4ea2fee032d678c4a4f244aa5a91747b5f23bf9c3363f4567d6a90c842316f7e9f5a5882f7540d7c58827d089a36f41b63ad5cb

data/bin/predix-ci

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# 
+# Copyright (c) 2011, 2012, 2013, 2014 Solano Labs All Rights Reserved
+#
+
+require 'yaml'
+
+if RUBY_VERSION < "2.1.0" && defined?(YAML::ENGINE) then
+  YAML::ENGINE.yamler = 'syck'
+end
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+if ENV['COVERAGE']
+  begin
+    require 'rubygems'
+    require 'simplecov'
+    SimpleCov.root(ENV['COVERAGE_ROOT'])
+    SimpleCov.start do
+      add_group "Commands", "lib/cli/solano/commands"
+    end
+  rescue => e
+    STDERR.puts "Can't load simplecov: #{e.inspect} #{e.backtrace}"
+  end
+end
+
+require "solano"
+require "solano/cli"
+Solano::SolanoCli.start

data/lib/solano/cli/api.rb

@@ -275,10 +275,6 @@ module Solano
       call_api(:delete, "#{Api::Path::SUITES}/#{id}/permanent_destroy", params)
     end
 
-    def demand_repoman_account(id, params={})
-      call_api(:post, "#{Api::Path::ACCOUNTS}/#{id}/demand_repoman", params)
-    end
-
     def get_sessions(params={})
       begin
         call_api(:get, Api::Path::SESSIONS, params)['sessions']

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

@@ -8,7 +8,7 @@ module Solano
     method_option :ssh_key_file, :type => :string, :default => nil
     def activate
       say "To activate your account, please visit"
-      say "https://ci.solanolabs.com/"
+      say "https://ci.predix.io/"
 
       solano_setup({:scm => false})
     end

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

@@ -9,7 +9,7 @@ module Solano
     method_option :app, :type => :string, :default => nil
     def heroku
       say "To activate your heroku account, please visit"
-      say "https://ci.solanolabs.com/"
+      say "https://ci.predix.io/"
 
       solano_setup({:scm => false})
     end

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

@@ -2,7 +2,7 @@
 
 module Solano
   class SolanoCli < Thor
-    desc "login [[TOKEN]]", "Log in using your email address or token (see: https://ci.solanolabs.com/user_settings/token)"
+    desc "login [[TOKEN]]", "Log in using your email address or token (see: https://ci.predix.io/user_settings/token)"
     method_option :email, :type => :string, :default => nil
     method_option :password, :type => :string, :default => nil
     method_option :ssh_key_file, :type => :string, :default => nil

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

@@ -9,6 +9,7 @@ module Solano
     method_option :no_op, :type=>:boolean, :default => false, :aliases => ["-n"]
     method_option :force, :type=>:boolean, :default => false
     method_option :profile, :type => :string, :default => nil, :aliases => %w(--profile-name)
+    method_option :queue, :type => :string, :default => nil
     def rerun(session_id=nil)
       params = {:scm => true, :repo => false}
       if session_id.nil? then
@@ -36,6 +37,7 @@ module Solano
       cmd += " --org=#{options[:account]}" if options[:account]
       cmd += " --force" if options[:force]
       cmd += " --profile=#{profile}" if profile
+      cmd += " --queue=#{options[:queue]}" if options[:queue]
       cmd += " #{tests.join(" ")}"
 
       say cmd

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

@@ -80,27 +80,10 @@ module Solano
         say Text::Process::USING_SPEC_OPTION[:test_exclude_pattern] % test_exclude_pattern
       end
 
-      tries = 0
-      while tries < Default::SCM_READY_TRIES do
-        # Call the API to get the suite and its tests
-        suite_details = @solano_api.get_suite_by_id(@solano_api.current_suite_id,
+       # Call the API to get the suite and its tests
+      suite_details = @solano_api.get_suite_by_id(@solano_api.current_suite_id,
                                                     :session_id => options[:session_id])
 
-        if suite_details["repoman_current"] == true
-          break
-        else
-          @solano_api.demand_repoman_account(suite_details["account_id"])
-
-          say Text::Process::SCM_REPO_WAIT
-          sleep @api_config.scm_ready_sleep
-        end
-
-        tries += 1
-      end
-      exit_failure Text::Error::SCM_REPO_NOT_READY unless suite_details["repoman_current"]
-
-      #update_suite_parameters!(suite_details, options[:session_id])
-
       start_time = Time.now
 
       new_session_params = {

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2015 Solano Labs All Rights Reserved
+# Copyright (c) 2011-2017 Solano Labs All Rights Reserved
 
 require 'stringio'
 
@@ -7,6 +7,8 @@ module Solano
     desc "status", "Display information about this suite, and any open dev sessions"
     method_option :json, :type => :boolean, :default => false
     method_option :commit, :type => :string, :default => nil
+    method_option :account, :type => :string, :default => nil,
+                  :aliases => %w(--org --organization)
     def status
       solano_setup({:repo => true})
 
@@ -14,14 +16,13 @@ module Solano
         # solano_setup asserts that we're in a supported SCM repo
         origin_url = @scm.origin_url
         repo_params = {
-          :active => true, 
+          :active => true,
           :repo_url => origin_url
         }
 
         if suite_for_current_branch? then
           status_branch = @solano_api.current_branch
           suite_params = {
-            :suite_id => @solano_api.current_suite_id,
             :active => false,
             :limit => 10
           }
@@ -29,7 +30,6 @@ module Solano
           status_branch = @solano_api.default_branch
           say Text::Error::TRY_DEFAULT_BRANCH % status_branch
           suite_params = {
-            :suite_id => @solano_api.default_suite_id,
             :active => false,
             :limit => 10
           }
@@ -40,6 +40,26 @@ module Solano
           suite_params[:last_commit_id] = options[:commit]
         end
 
+        suites = @solano_api.get_suites(:repo_url => origin_url, :branch => status_branch)
+        if suites.count == 0
+          exit_failure Text::Error::CANT_FIND_SUITE % [origin_url, status_branch]
+        elsif suites.count > 1
+          if options[:account] then
+            suites = suites.select { |s| s['account'] == options[:account] }
+          else
+            say Text::Status::SUITE_IN_MULTIPLE_ACCOUNTS % [origin_url, status_branch]
+            suites.each { |s| say '  ' + s['account'] }
+            account = ask Text::Status::SUITE_IN_MULTIPLE_ACCOUNTS_PROMPT
+            suites = suites.select { |s| s['account'] == account }
+          end
+        end
+
+        if suites.count == 0
+          exit_failure Text::Error::INVALID_ACCOUNT_NAME
+        end
+
+        suite_params[:suite_id] = suites.first['id']
+
         if options[:json] 
           res = {}
           res[:running] = { origin_url => @solano_api.get_sessions(repo_params) }          

data/lib/solano/cli/config.rb

@@ -189,15 +189,15 @@ module Solano
     def write_scm_ignore
       path = @scm.ignore_path
       content = File.exists?(path) ? File.read(path) : ''
-      unless content.include?(".solano*\n")
+      unless content.include?(".predix-ci*\n")
         File.open(path, File::CREAT|File::APPEND|File::RDWR, 0644) do |file|
-          file.write(".solano*\n")
+          file.write(".predix-ci*\n")
         end
       end
     end
 
     def solano_file_name(scope=:repo, kind='', root=nil)
-      ext = (@host == 'api.tddium.com' || @host == 'ci.solanolabs.com') ? '' : ".#{@host}"
+      ext = (@host == 'ci.predix.io') ? '' : ".#{@host}"
 
       case scope
       when :repo
@@ -207,7 +207,7 @@ module Solano
         root = ENV['HOME']
       end
 
-      return File.join(root, ".solano#{kind}#{ext}")
+      return File.join(root, ".predix-ci#{kind}#{ext}")
     end
 
     def solano_deploy_key_file_name

data/lib/solano/cli/params_helper.rb

@@ -4,7 +4,7 @@ module ParamsHelper
   include SolanoConstant
 
   def default_host params
-    params['host'] || ENV['SOLANO_CLIENT_HOST'] || ENV['TDDIUM_CLIENT_HOST'] || 'ci.solanolabs.com'
+    params['host'] || ENV['SOLANO_CLIENT_HOST'] || ENV['TDDIUM_CLIENT_HOST'] || 'ci.predix.io'
   end
 
   def default_port params

data/lib/solano/cli/util.rb

@@ -1,4 +1,6 @@
-# Copyright (c) 2011, 2012, 2013, 2014 Solano Labs All Rights Reserved
+# Copyright (c) 2011-2017 Solano Labs All Rights Reserved
+
+require 'tempfile'
 
 module Solano
   class SolanoCli < Thor

data/lib/solano/constant.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2016 Solano Labs All Rights Reserved
+# Copyright (c) 2011-2017 Solano Labs All Rights Reserved
 
 module SolanoConstant
 
@@ -16,23 +16,22 @@ module SolanoConstant
 
     GIT_SERVER = "git.solanolabs.com"
     READY_TRIES = 3
-    SCM_READY_TRIES = 18
-    SCM_READY_SLEEP = 10
     TEST_FINISH_TIMEOUT = 15 * 60 # 15 minutes
 
     PARAMS_PATH = "#{ENV['HOME']}/.solano-server"
   end
 
   module Config
-    REMOTE_NAME = "solano"
+    REMOTE_NAME = "predix-ci"
     HG_IGNORE = ".hgignore"
     GIT_IGNORE = ".gitignore"
-    CONFIG_PATHS = ["solano.yml",
-                    "config/solano.yml"
+    CONFIG_PATHS = ["predix-ci.yml",
+                    "config/predix-ci.yml"
                    ]
     CONFIG_PATHS_DEPRECATED = ["tddium.yml",
                                "config/tddium.yml",
-                               "config/tddium.cfg"
+                               "solano.yml",
+                               "config/solano.yml"
                               ]
     EMBEDDED_SCRIPT_PATH = File.expand_path(File.join("..", "script"), __FILE__)
   end
@@ -96,7 +95,7 @@ module SolanoConstant
 
 * The hg <-> git mirror is missing.
 
-Please run `solano hg:mirror` to create the mirror for the first time.
+Please run `predix-ci hg:mirror` to create the mirror for the first time.
 
 (Note: it may take several minutes, or even an hour, for hg:mirror to complete,
  depending on how large your repo is. Rest assured, you'll only need to run hg:mirror once.)
@@ -112,7 +111,7 @@ EOF
       YAML_PARSE_FAILED = "Unable to parse %s as YAML"
       TEST_CONFIGS_MUST_BE_LIST = "The test_configs section of solano.yml must be a list of configurations"
       NO_SSH_KEY =<<EOF
-You have not set an ssh key for your user.  Please add an ssh key using `solano keys:add` or visit http://ci.solanolabs.com/user_settings/ssh_keys
+You have not set an ssh key for your user.  Please add an ssh key using `solano keys:add` or visit https://ci.predix.io/user_settings/ssh_keys
 EOF
       SAME_SNAPSHOT_COMMIT = "Snapshot commit is the same as HEAD"
       EMPTY_PATCH = "Patch not created because it would have been empty. Most likely the commit exists in the snapshot already"
@@ -155,14 +154,14 @@ EOF
       REMOVE_CONFIG_DONE = "Removed config '%s' from %s"
       CONFIG_EDIT_COMMANDS =<<EOF
 
-Use `solano config:add <scope> <key> <value>` to set a config key.
-Use `solano config:remove <scope> <key>` to remove a key.
+Use `predix-ci config:add <scope> <key> <value>` to set a config key.
+Use `predix-ci config:remove <scope> <key>` to remove a key.
 
 EOF
       KEYS_EDIT_COMMANDS =<<EOF
 
-Use `solano keys:add` to generate and authorize a new SSH keypair.
-Use `solano keys:remove` to remove an authorized key from Solano CI.
+Use `predix-ci keys:add` to generate and authorize a new SSH keypair.
+Use `predix-ci keys:remove` to remove an authorized key from Solano CI.
 
 Use `ssh-keygen -lf <filename>` to print fingerprint of an existing public key.
 
@@ -174,19 +173,18 @@ EOF
 
     You can instead specify a list of test patterns in config/solano.yml.
 
-    Read more here: https://docs.solanolabs.com/
+    Read more here: https://ci.predix.io/docs
 
 EOF
-      NO_CONFIGURED_SUITE = "Looks like you haven't configured Solano CI on this computer for %s/%s...\n"
-      FOUND_EXISTING_SUITE = "Found a suite in Solano CI for\n\n%s\n\n(on branch %s)."
+      NO_CONFIGURED_SUITE = "Looks like you haven't configured Predix CI on this computer for %s/%s...\n"
+      FOUND_EXISTING_SUITE = "Found a suite in Predix CI for\n\n%s\n\n(on branch %s)."
       TERMINATE_INSTRUCTION = ">>> Press Ctrl-C to stop waiting.  Tests will continue running.\n"
       INTERRUPT = "Interrupted"
-      SCM_PUSH = ">>> Pushing changes to Solano CI..."
-      SCM_REPO_WAIT = ">>> Waiting for your repository to be prepared. Sleeping for 10 seconds..."
+      SCM_PUSH = ">>> Pushing changes to Predix CI..."
       STARTING_TEST = ">>> Starting Session with %s tests..."
-      CHECK_TEST_STATUS = ">>> Use 'solano status' to check on pending jobs"
+      CHECK_TEST_STATUS = ">>> Use 'predix-ci status' to check on pending jobs"
       FINISHED_TEST = "Finished in %s seconds"
-      RUN_SOLANO_WEB = "\n>>> Run `solano web` to open the latest test results in your browser.\n"
+      RUN_SOLANO_WEB = "\n>>> Run `predix-ci web` to open the latest test results in your browser.\n"
       CHECK_TEST_REPORT = ">>> To view results, visit: %s"
       FAILED_TESTS = "Failed tests:"
       SUMMARY_STATUS = "Final result: %s."
@@ -203,7 +201,7 @@ EOF
 
 Next, you should register your test suite and start tests by running:
 
-$ solano run
+$ predix-ci run
 
 "
       ALREADY_LOGGED_IN = "You're already logged in"
@@ -230,7 +228,7 @@ $ solano run
 
 >>> To change the pattern:
     1. Edit %s
-    2. Run `solano suite --edit` again.
+    2. Run `predix-ci suite --edit` again.
 EOF
       CONFIGURED_EXCLUDE_PATTERN =<<EOF;
 ... Configured test exclude pattern from %s:
@@ -239,7 +237,7 @@ EOF
 
 >>> To change the pattern:
     1. Edit %s
-    2. Run `solano suite --edit` again.
+    2. Run `predix-ci suite --edit` again.
 EOF
       DETECTED_BRANCH = "... Detected branch %s"
       SETUP_CI=<<EOF;
@@ -281,12 +279,12 @@ Showing %s tests
 EOF
       RERUN_SESSION =<<EOF
 
-Re-run failures from a session with `solano rerun <session_id>`.
-Extract details of a session with `solano describe <session_id>`.
+Re-run failures from a session with `predix-ci rerun <session_id>`.
+Extract details of a session with `predix-ci describe <session_id>`.
 
 EOF
       OPTIONS_SAVED = 'Options have been successfully saved.'
-      NOT_SAVED_OPTIONS = 'There is no server information saved. Run `solano server:set`.'
+      NOT_SAVED_OPTIONS = 'There is no server information saved. Run `predix-ci server:set`.'
       BUILD_CONTINUES = 'Session will continue running.'
       USING_PROFILE = "Starting session with profile '%s'"
       VOLUME_OVERRIDE = "Worker volume set to %s"
@@ -303,7 +301,7 @@ EOF
       CREATING_PATCH =<<EOF
 Creating a Patch by running
 %s
-Please see http://docs.solanolabs.com/RunningBuild/snapshots-and-patches/ for more info on patching
+Please see https://ci.predix.io/docs/RunningBuild/snapshots-and-patches/ for more info on patching
 EOF
       ASK_FOR_SNAPSHOT =<<EOF
 Since we could not create a patch, we can try creating a snapshot instead. This may take longer to upload, then a patch.
@@ -438,6 +436,8 @@ Session Details:
  Finished: %s
 
 EOF
+      SUITE_IN_MULTIPLE_ACCOUNTS = "The suite %s/%s exists in multiple organization:"
+      SUITE_IN_MULTIPLE_ACCOUNTS_PROMPT = "Which organization do you want to use to get the status:"
     end
 
     module Error
@@ -471,7 +471,6 @@ You entered:
 EOF
       SCM_NOT_A_REPOSITORY = "Current working directory is not a suitable repository"
       SCM_NO_ORIGIN = "Origin URI not set; Solano CI requires origin URI to identify repository"
-      SCM_REPO_NOT_READY = "Your repository is being prepped.  Try again in a minute."
       SCM_PUSH_FAILED = <<EOF;
 
 Attempt to push source to Solano CI failed.
@@ -518,7 +517,7 @@ EOF
       PASSWORD_ERROR = "Error changing password: %s"
       ADD_MEMBER_ERROR = "Error adding %s: %s"
       REMOVE_MEMBER_ERROR = "Error removing %s: %s"
-      USE_ACTIVATE = "Visit 'https://ci.solanolabs.com' to activate your account for the first time."
+      USE_ACTIVATE = "Visit 'https://ci.predix.io' to activate your account for the first time."
       INVALID_CREDENTIALS = "Your .solano file has an invalid API key.\nRun `solano logout` and `solano login`, and then try again."
       MISSING_ACCOUNT_OPTION = "You must specify an organization by passing the --org option."
       MISSING_ACCOUNT = "You must specify an organization."
@@ -530,7 +529,7 @@ ERROR: could not invoke solano command
 Usage: "solano COMMAND [ARGS] [OPTIONS]". For available commands, run "solano help".
 EOF
       CONFIG_PATHS_COLLISION =<<EOF
-You have both solano.yml and tddium.yml in your repo. We don't support merging the configuration from both of these files, so you'll have to pick one. The solano.yml file will soon be deprecated, so we recommend migrating all of your configuration to solano.yml.
+You have multiple configs in your repo. We don't support merging the configuration from both of these files, so you'll have to pick one. The solano.yml file will soon be deprecated, so we recommend migrating all of your configuration to solano.yml.
 EOF
       CANNOT_OVERRIDE_PROFILE="Cannot override profile for existing session"
       CANNOT_OVERRIDE_QUEUE="Cannot override queue for existing session"

data/lib/solano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solano
 version: !ruby/object:Gem::Version
-  version: 1.31.7
+  version: 1.31.10
 platform: ruby
 authors:
-- Solano Labs
+- GE Digital LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -89,7 +89,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: nayutaya-msgpack-pure
   requirement: !ruby/object:Gem::Requirement
@@ -317,27 +317,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.4'
 description: |
-  Solano CI runs your test suite simply and quickly in our managed
+  Predix CI runs your test suite simply and quickly in our managed
   cloud environment.  You can run tests by hand, or enable our hosted CI to watch
   your git repos automatically.
 
-  Solano CI automatically and safely parallelizes your tests to save you time, and
+  Predix CI automatically and safely parallelizes your tests to save you time, and
   takes care of setting up fresh isolated DB instances for each test thread.
 
   Tests have access to a wide variety of databases (postgres, mongo, redis,
   mysql, memcache), solr, sphinx, selenium/webdriver browsers, webkit and culerity.
 
-  Solano CI supports all common Ruby test frameworks, including rspec, cucumber,
-  test::unit, and spinach.  Solano CI also supports Javascript testing using
+  Predix CI supports all common Ruby test frameworks, including rspec, cucumber,
+  test::unit, and spinach.  Predix CI also supports Javascript testing using
   jasmine, evergreen, and many other frameworks.
 email:
-- info@solanolabs.com
+- build-ge-solano@ge.com
 executables:
+- predix-ci
 - solano
 - tddium
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/predix-ci
 - bin/solano
 - bin/tddium
 - lib/solano.rb
@@ -409,8 +411,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
-summary: Run tests in Solano CI Hosted Test Environment
+summary: Run tests in Predix CI Hosted Test Environment
 test_files: []