gitlab-swat 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7764e07cd7efc9efec68895fe07f7c8a2c3db9d
-  data.tar.gz: 679cc6ac1ae287113cb9fc3f70c6282c2eaaedb6
+  metadata.gz: 7ed01cc88af1e9fe76a883abb9bca46193bbab7c
+  data.tar.gz: edc42911534f120e21d3f51947410bffbf946089
 SHA512:
-  metadata.gz: f323d1a8b248bad4c21b11a734a97697bb96961df59dee5b724dbe64bf4ecda27773a8120b40438349097c6f5511a30c60996412671fb40a49f8fe5e6b00deef
-  data.tar.gz: d5165ea4b0ebfb42e9ddc10d63fae6b8e2a5b1ea80e30f324ed0514b2ec99fc812b674684aebe3cb21f2e16bef0c0f40698f9bbe88dde91f0a57bc031d508a0a
+  metadata.gz: b2604e5caeb9060948625862970c47728508aa1b273e98d0ade9be64bd64e91349d65510b2af25d7088df2c25b9377b723cc4796a5740f313ac584c07e64f7c8
+  data.tar.gz: 59a301df2c16b15a20075817349f0f182878b944b4b8bbef8139e8a6e3a970c8de16e0ec7e9f6beb5fb14c02a846007d01f688d3c0f821dc9df62ebd510332f9

data/.rubocop.yml

@@ -1,3 +1,12 @@
+AllCops:
+  TargetRubyVersion: 2.3.3
+  Include:
+    - 'lib/**/*.rb'
+  Exclude:
+    - 'Gemfile'
+    - 'spec/**/*.rb'
+    - 'vendor/**/*'
+
 # Commonly used screens these days easily fit more than 80 characters.
 Metrics/LineLength:
   Max: 120
@@ -24,7 +33,3 @@ Metrics/MethodLength:
 
 Metrics/AbcSize:
   Enabled: false
-
-Metrics/BlockLength:
-    Exclude:
-      - 'spec/**/*.rb'

data/README.md

@@ -72,6 +72,7 @@ Any stage that raises an exception will stop the execution, and will force and e
 ```sh
 $ SCRIPTS_LOCAL_PATH=/home/user/src/gitlab.com/gitlab-cog/swat/scripts RAILS_RUNNER_COMMAND="rails r /home/user/src/gitlab.com/gitlab-cog/swat/lib/swat_run.rb" RAILS_WORKING_DIR=/home/user/src/gitlab.com/gitlab-cog/rails-project COG_COMMAND="dryrun" COG_ARGV_0="test" COG_ARGV_1="success" COG_ARGV_2="success" COG_ARGC=3 ./cog-command
 COG_TEMPLATE: execution_result
+JSON
 {"execution_mode":"dryrun","prepare":{"successful":true,"output":"preparation is fine so far"},"pre_check":{"successful":true,"output":"all is gut"}}
 ```
 
@@ -80,6 +81,7 @@ COG_TEMPLATE: execution_result
 ```sh
 $ SCRIPTS_LOCAL_PATH=/home/user/src/gitlab.com/gitlab-cog/swat/scripts RAILS_RUNNER_COMMAND="rails r /home/user/src/gitlab.com/gitlab-cog/swat/lib/swat_run.rb" RAILS_WORKING_DIR=/home/user/src/gitlab.com/gitlab-cog/rails-project COG_COMMAND="strike" COG_ARGV_0="test" COG_ARGV_1="success" COG_ARGV_2="success" COG_ARGC=3 ./cog-command
 COG_TEMPLATE: execution_result
+JSON
 {"execution_mode":"execute","prepare":{"successful":true,"output":"preparation is fine so far"},"pre_check":{"successful":true,"output":"all is gut"},"execute":{"successful":true,"output":"Context so far is {:prepared=\u003e\"done\", :checks=\u003e\"done\"}"}}
 ```
 
@@ -87,15 +89,18 @@ COG_TEMPLATE: execution_result
 
 ```sh
 $ SCRIPTS_LOCAL_PATH=/tmp/testing-cog/second SCRIPTS_REMOTE_URL=$(pwd) COG_COMMAND="reload" ./cog-command
+JSON
 {"source":"/home/user/src/gitlab.com/gitlab-cog/swat","target":"/tmp/testing-cog/scripts","action":"clone","wiped":false, "head":"1234 current commit"}
 ```
 
 ```sh
 $ SCRIPTS_LOCAL_PATH=/tmp/testing-cog/second SCRIPTS_REMOTE_URL=$(pwd) COG_COMMAND="reload" ./cog-command
+JSON
 {"source":"/home/user/src/gitlab.com/gitlab-cog/swat","target":"/tmp/testing-cog/scripts","action":"pull","wiped":false, "head":"1234 current commit"}
 ```
 
 ```sh
 $ SCRIPTS_LOCAL_PATH=/tmp/testing-cog/second SCRIPTS_REMOTE_URL=$(pwd) COG_COMMAND="reload" COG_OPTS=wipe COG_OPT_WIPE=true ./cog-command
+JSON
 {"source":"/home/user/src/gitlab.com/gitlab-cog/swat","target":"/tmp/testing-cog/scripts","action":"clone","wiped":true, "head":"1234 current commit"}
 ```

data/{gitlab-swat.gemspec → gitlab_swat.gemspec}

@@ -1,15 +1,13 @@
 Gem::Specification.new do |s|
   s.name          = "gitlab-swat"
-  s.version       = "0.1.0"
+  s.version       = "0.1.1"
   s.date          = "2017-04-01"
   s.summary       = "ChatOps Cog Bundle that enables admins to remotely run predefined scripts in a rails console"
   s.description   = <<~eos
     A Successful Deployment Ends Peacefully With No Bullets Fired.
-    If That’s Simply Not Possible, SWAT Uses Special Weapons and Tactics to Keep the Public Safe
-
-    GitLab-Swat allows admins to quickly deploy scripts that can be remotely executed through a rails console
-
-    Allowing fast action by using an external git repository as the scripts source, but keeping safety high by
+    If That’s Simply Not Possible, SWAT Uses Special Weapons and Tactics to Keep the Public Safe\n\n
+    GitLab-Swat allows admins to quickly deploy scripts that can be remotely executed through a rails console\n
+    Enabling fast action by using an external git repository as the scripts source, but keeping safety high by
     enforcing a prepare-pre check-execute model that allows execution break at any stage if things are not going
     as expected
 eos

data/lib/cog_cmd/swat/reload.rb

@@ -14,7 +14,7 @@ module CogCmd
         result = { source: git.source,
                    target: git.target,
                    wiped: wipe? }.merge(git.update)
-        response.content = result.to_json
+        response.content = result
       end
 
       def wipe?

data/lib/cog_cmd/swat/strike.rb

@@ -11,7 +11,7 @@ module CogCmd
       def run_command
         rails = ::Swat::RailsLoader.new
         response.template = "execution_result"
-        response.content = rails.run("execute #{request.args.join(' ')}").to_s
+        response.content = rails.run("execute #{request.args.join(' ')}")
       end
     end
   end

data/lib/rails_loader.rb

@@ -37,7 +37,7 @@ module Swat
           fail "Command #{args} failed with err: '#{stderr.read.strip}' " \
                "out: '#{stdout.read.strip}'"
         end
-        stdout.read.strip
+        JSON.parse(stdout.read.strip)
       end
     end
   end

data/spec/rails_loader_spec.rb

@@ -6,9 +6,9 @@ describe Swat::RailsLoader do
     expect(::Swat::RailsLoader
       .new("./spec/helpers/rails_stub.rb lib/swat_run.rb")
       .run("dryrun test success"))
-      .to eq("{\"execution_mode\":\"dryrun\",\"prepare\":{\"successful\":true," \
-              "\"output\":\"preparation is fine so far\"}," \
-             "\"pre_check\":{\"successful\":true,\"output\":\"all is gut\"}}")
+      .to eq("execution_mode"=>"dryrun",
+             "prepare"=>{"successful"=>true, "output"=>"preparation is fine so far"},
+             "pre_check"=>{"successful"=>true, "output"=>"all is gut"})
   end
 
   it "can err out when the return code is not 0" do

data/spec/swat_dryrun_spec.rb

@@ -14,8 +14,8 @@ describe CogCmd::Swat::Dryrun do
       command.run_command
     end
     expect(command.response.content)
-      .to eq("{\"execution_mode\":\"dryrun\",\"prepare\":{\"successful\":true," \
-             "\"output\":\"preparation is fine so far\"}," \
-             "\"pre_check\":{\"successful\":true,\"output\":\"all is gut\"}}")
+      .to eq("execution_mode"=>"dryrun",
+             "prepare"=>{"successful"=>true, "output"=>"preparation is fine so far"},
+             "pre_check"=>{"successful"=>true, "output"=>"all is gut"})
   end
 end

data/spec/swat_reload_spec.rb

@@ -14,11 +14,11 @@ describe CogCmd::Swat::Reload do
   it "reloads the repo" do
     command = CogCmd::Swat::Reload.new
     command.run_command
-    expect(JSON.parse(command.response.content)).to include(
-      "source" => git.source_repo,
-      "target" => git.target_dir,
-      "action" => "clone",
-      "wiped" => false
+    expect(command.response.content).to include(
+      source: git.source_repo,
+      target: git.target_dir,
+      action: "clone",
+      wiped: false
     )
   end
 
@@ -28,11 +28,11 @@ describe CogCmd::Swat::Reload do
       ENV["COG_OPTS"] = "wipe"
       ENV["COG_OPT_WIPE"] = "true"
       command.run_command
-      expect(JSON.parse(command.response.content)).to include(
-        "source" => git.source_repo,
-        "target" => git.target_dir,
-        "action" => "clone",
-        "wiped" => true
+      expect(command.response.content).to include(
+        source: git.source_repo,
+        target: git.target_dir,
+        action: "clone",
+        wiped: true
       )
     ensure
       ENV.delete("COG_OPTS")
@@ -45,11 +45,11 @@ describe CogCmd::Swat::Reload do
     command.run_command
     command.run_command
     command.run_command
-    expect(JSON.parse(command.response.content)).to include(
-      "source" => git.source_repo,
-      "target" => git.target_dir,
-      "action" => "pull",
-      "wiped" => false
+    expect(command.response.content).to include(
+      source: git.source_repo,
+      target: git.target_dir,
+      action: "pull",
+      wiped: false
     )
   end
 

data/spec/swat_strike_spec.rb

@@ -14,9 +14,10 @@ describe CogCmd::Swat::Strike do
       command.run_command
     end
     expect(command.response.content)
-      .to eq("{\"execution_mode\":\"execute\",\"prepare\":{\"successful\":true," \
-            "\"output\":\"preparation is fine so far\"},\"pre_check\":{\"successful\":true," \
-            "\"output\":\"all is gut\"},\"execute\":{\"successful\":true," \
-            "\"output\":\"Context so far is {:prepared=>\\\"done\\\", :checks=>\\\"done\\\"}\"}}")
+      .to eq("execution_mode"=>"execute",
+             "prepare"=>{"successful"=>true, "output"=>"preparation is fine so far"},
+             "pre_check" => {"successful"=>true, "output"=>"all is gut"},
+             "execute"=>{"successful"=>true,
+                         "output"=>"Context so far is {:prepared=>\"done\", :checks=>\"done\"}"})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-swat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pablo Carranza
@@ -70,9 +70,10 @@ description: |
   A Successful Deployment Ends Peacefully With No Bullets Fired.
   If That’s Simply Not Possible, SWAT Uses Special Weapons and Tactics to Keep the Public Safe
 
+
   GitLab-Swat allows admins to quickly deploy scripts that can be remotely executed through a rails console
 
-  Allowing fast action by using an external git repository as the scripts source, but keeping safety high by
+  Enabling fast action by using an external git repository as the scripts source, but keeping safety high by
   enforcing a prepare-pre check-execute model that allows execution break at any stage if things are not going
   as expected
 email: pablo@gitlab.com
@@ -87,7 +88,7 @@ files:
 - README.md
 - cog-command
 - config.yaml
-- gitlab-swat.gemspec
+- gitlab_swat.gemspec
 - lib/cog_cmd/swat/dryrun.rb
 - lib/cog_cmd/swat/reload.rb
 - lib/cog_cmd/swat/strike.rb