sambot 0.1.104 → 0.1.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b5664364955f056a24c4f7ba4c91fd231cbd89
-  data.tar.gz: e609b6fc8a4a5f8979575349ea2c2bf7655015cc
+  metadata.gz: 1bf476d1d26fedc75e7af52b286dd4afc62f550e
+  data.tar.gz: a3faf0302e3e640f36acc8efc2eb6f8573c6c626
 SHA512:
-  metadata.gz: 467ec596bed4a9a88afe498ca974d7d541ca4854234ef264943ac5c5368b6054479b0aa19b295060fccaff792567f4195c0d1b4e091d34557184701418e84579
-  data.tar.gz: bca33c2edf61f8a75dc3c2aaae95627c0cd1923874fdd01ec3fc55b3237ed77aa1200ec59055c497ceed4501ded02a8bd69ce205f3be2c82dcf03c55cb6c1567
+  metadata.gz: b50102c8892b7fd83feb15f1954e4a870b035e0948af32ef9056db11d08673ede99e6406aeed3d3c3f67cf9a92e1526d2016d188e53a9130bb4031b9c5459025
+  data.tar.gz: 0ec80be8220908bb3395e834c0ff082001681347f1c1447a31fc34c51cc5837a65b2b1eba05bacd6adc26ec40ab86e988b74e986944ef38f924205b1a8a0a20d

data/lib/sambot/chef/kitchen.rb

@@ -17,7 +17,21 @@ module Sambot
             "#{KITCHEN_RACKSPACE_YML}": read_template(KITCHEN_RACKSPACE_YML, cookbook_name, platforms)
           }
           test_kitchen_configs.each do |key, value|
-            value['suites'] = suites if suites
+            if suites
+              value['suites'] = Marshal.load(Marshal.dump(suites))
+              case key.to_s
+              when KITCHEN_GCP_YML
+                value['suites'].each do |config|
+                  config['attributes'] = config['attributes'] || {}
+                  config['attributes']['cloud_platform'] = 'GCP'
+                end
+              when KITCHEN_RACKSPACE_YML
+                value['suites'].each do |config|
+                  config['attributes'] = config['attributes'] || {}
+                  config['attributes']['cloud_platform'] = 'RACKSPACE'
+                end
+              end
+            end
             test_kitchen_configs[key] = value.to_yaml
           end
           test_kitchen_configs

data/lib/sambot/commands/base_command.rb

@@ -60,13 +60,26 @@ module Sambot
 
       no_commands do
 
-        def execute
+        def execute(access = :standard)
+          if access == :sudo
+            ensure_running_as_sudo
+          else
+            ensure_not_running_as_sudo
+          end
           Runtime.ensure_latest
           yield
         rescue ApplicationError => e
           UI.error(e.message)
         end
 
+        def ensure_not_running_as_sudo
+          raise ApplicationError, "This command should not be run as sudo" unless ENV['USER'] != 'root'
+        end
+
+        def ensure_running_as_sudo
+          raise ApplicationError, "This command needs to be run as sudo" unless ENV['USER'] == 'root'
+        end
+
         def config
            Config.new.read
         end

data/lib/sambot/commands/dns.rb

@@ -11,7 +11,7 @@ module Sambot
       desc 'remove', 'Removes the given DNS entry'
       option :hostname, :required => true, :desc => 'The DNS name for the A record'
       def remove
-        execute do
+        execute(:sudo) do
           Sambot::DNS::Repository.new.records.remove(options[:hostname])
         end
       end
@@ -37,7 +37,7 @@ module Sambot
       option :team, :desc => 'The team owning the instance pointed to. Leave blank if the hostname contains stable, patch or unstable i.e. stable-api'
       long_desc docs('cookbook/clean')
       def add
-          execute { Sambot::DNS::Repository.new.records.add(options[:hostname], options[:address], options[:team]) }
+          execute(:sudo) { Sambot::DNS::Repository.new.records.add(options[:hostname], options[:address], options[:team]) }
       end
 
     end

data/lib/sambot/commands/session.rb

@@ -8,7 +8,7 @@ module Sambot
 
       desc 'start', 'Start a new DEV/QE session'
       def start
-        execute do
+        execute(:sudo) do
           username = ENV['SAMBOT_SESSION_USERNAME']
           password = ENV['SAMBOT_SESSION_PASSWORD']
           unless username && password
@@ -22,7 +22,7 @@ module Sambot
 
       desc 'stop', 'Stop the DEV/QE session'
       def stop
-        execute { DeveloperWorkflow::Session.new.stop }
+        execute(:sudo) { DeveloperWorkflow::Session.new.stop }
       end
 
     end

data/lib/sambot/developer_workflow/session.rb

@@ -45,7 +45,6 @@ module Sambot
       private
 
       def kill_active_sessions
-        ensure_running_as_sudo
         Dante::Runner.new('sambot-session').execute(:kill => true)
         UI.debug("All active Sambot sessions have been closed.")
       end
@@ -67,10 +66,6 @@ module Sambot
         return false
       end
 
-      def ensure_running_as_sudo
-        raise ApplicationError, "This command needs to be run as sudo" unless ENV['USER'] == 'root'
-      end
-
       def start_daemon_for_tunneling(username, password)
         Dante::Runner.new('sambot-session').execute(:daemonize => true, :log_path => 'sambot-session.log') do
           setup_ssh_tunnels(username, password)

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.104'.freeze
+  VERSION = '0.1.105'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.104
+  version: 0.1.105
 platform: ruby
 authors:
 - Olivier Kouame