marty 2.5.2 → 2.5.4

data/spec/models/script_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-s1 =<<eof
+s1 = <<eof
 NodeA:
   attr = 123
 eof
 
-s2 =<<eof
+s2 = <<eof
 NodeB:
   attr = 456
 eof
@@ -22,7 +22,7 @@ describe Marty::Script do
     end
 
     it "doesn't create a new script entry if it already exists and is the " +
-      "same as the existing" do
+      'same as the existing' do
       Marty::Script.load_a_script('TestExistsAndSame', s1)
       expect { Marty::Script.load_a_script('TestExistsAndSame', s1) }.
         not_to change(Marty::Script, :count)
@@ -35,12 +35,16 @@ describe Marty::Script do
         to change(Marty::Script, :count).by(1)
 
       Marty::Script.load_a_script('TestExistsAndDifferent2', s1, now - 1.minute)
-      expect { Marty::Script.load_a_script('TestExistsAndDifferent2',
-                                           s2, now) }.
-        to change { Marty::Script.where(name: 'TestExistsAndDifferent2',
-                                        obsoleted_dt: 'infinity').count }.by(0)
+      expect do
+        Marty::Script.load_a_script('TestExistsAndDifferent2',
+                                    s2, now)
+      end.
+        to change {
+             Marty::Script.where(name: 'TestExistsAndDifferent2',
+                                        obsoleted_dt: 'infinity').count
+           }           .by(0)
       expect(Marty::Script.find_by(
-               obsoleted_dt: 'infinity', name: 'TestExistsAndDifferent2').
+        obsoleted_dt: 'infinity', name: 'TestExistsAndDifferent2').
                created_dt.to_s).to eq(now.to_s)
     end
   end
@@ -53,7 +57,7 @@ describe Marty::Script do
     let(:now) { Time.zone.now - 1.minute }
 
     it 'loads each script given a hash' do
-      Marty::Script.load_script_bodies({'Test1' => s1, 'Test2' => s2}, now)
+      Marty::Script.load_script_bodies({ 'Test1' => s1, 'Test2' => s2 }, now)
       expect(Marty::Script).to have_received(:load_a_script).
         with('Test1', s1, now)
       expect(Marty::Script).to have_received(:load_a_script).
@@ -71,32 +75,38 @@ describe Marty::Script do
     end
 
     it 'creates a new tag if none exist yet with provided datetime' do
-      expect { @tag = Marty::Script.load_script_bodies({'Test1' => s1,
-                                                        'Test2' => s2}, now) }.
+      expect do
+        @tag = Marty::Script.load_script_bodies({ 'Test1' => s1,
+                                                        'Test2' => s2 }, now)
+      end.
         to change(Marty::Tag, :count).by(1)
       expect(@tag.created_dt).to eq(now + 1.second)
     end
 
     it 'creates a new tag when there is an older one present' do
       Marty::Tag.do_create(now - 1.minute, 'initial test tag')
-      expect { @tag = Marty::Script.load_script_bodies({'Test1' => s1,
-                                                        'Test2' => s2}, now) }.
+      expect do
+        @tag = Marty::Script.load_script_bodies({ 'Test1' => s1,
+                                                        'Test2' => s2 }, now)
+      end.
         to change(Marty::Tag, :count).by(1)
       expect(@tag.created_dt).to eq(now + 1.second)
     end
 
     it 'creates a new tag when no previous tag is present and no datetime ' +
       'provided' do
-      expect { tag = Marty::Script.load_script_bodies({'Test1' => s1,
-                                                       'Test2' => s2}) }.
+      expect do
+        tag = Marty::Script.load_script_bodies('Test1' => s1,
+                                                       'Test2' => s2)
+      end.
         to change(Marty::Tag, :count).by(1)
     end
 
     it "doesn't create a new tag if one is present and the script wasn't" +
-      "modified" do
+      'modified' do
       Marty::Script.create!(name: 'Test1', body: s1, created_dt: now)
       Marty::Tag.do_create(now + 1.second, 'tag created by test')
-      expect { Marty::Script.load_script_bodies({'Test1' => s1}) }.
+      expect { Marty::Script.load_script_bodies('Test1' => s1) }.
         not_to change(Marty::Tag, :count)
     end
   end
@@ -118,7 +128,6 @@ describe Marty::Script do
       expect(Marty::Script).to have_received(:load_script_bodies).
         with(match_array([['Script1', ls1], ['Script2', ls2]]), now)
     end
-
   end
 
   describe '.get_script_filenames' do

data/spec/models/user_spec.rb

@@ -7,12 +7,12 @@ module Marty
         system_user.login
     end
 
-    let (:tuser) {
+    let (:tuser) do
       create_user('other_user')
-    }
+    end
 
-    describe "validations" do
-      it "should require login, firstname and lastname" do
+    describe 'validations' do
+      it 'should require login, firstname and lastname' do
         user = User.new
         expect(user).to_not be_valid
         expect(user.errors[:login].any?).to be true
@@ -20,7 +20,7 @@ module Marty
         expect(user.errors[:lastname].any?).to be true
       end
 
-      it "should require unique login" do
+      it 'should require unique login' do
         expect(Mcfly.whodunnit).to_not be_nil
         user = system_user.dup
         expect(user).to_not be_valid
@@ -29,7 +29,7 @@ module Marty
         expect(user).to be_valid
       end
 
-      it "should not allow Gemini account to be de-activated" do
+      it 'should not allow Gemini account to be de-activated' do
         user = system_user
         user.active = false
         expect(user).to_not be_valid
@@ -37,13 +37,13 @@ module Marty
           to include('application system account cannot be deactivated')
       end
 
-      it "should not allow accounts to be deleted" do
+      it 'should not allow accounts to be deleted' do
         user = system_user
         user.destroy
         expect(user.destroyed?).to be false
       end
 
-      it "should not allow user managers to edit the Gemini account" do
+      it 'should not allow user managers to edit the Gemini account' do
         Mcfly.whodunnit = tuser
         user = system_user
         allow_any_instance_of(Marty::User).to receive(:user_manager_only).
@@ -54,7 +54,7 @@ module Marty
           to include('cannot edit the application system account')
       end
 
-      it "should not allow user managers to edit their own account" do
+      it 'should not allow user managers to edit their own account' do
         Mcfly.whodunnit = tuser
         allow_any_instance_of(Marty::User).to receive(:user_manager_only).
           and_return(true)

data/spec/other/diagnostic/base_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Marty::Diagnostic::Base do
-  def sample_data consistent=true
-    node_data_a = described_class.pack(include_ip=false){'A'}
-    node_data_b = described_class.pack(include_ip=false){'B'}
+  def sample_data consistent = true
+    node_data_a = described_class.pack(include_ip = false) { 'A' }
+    node_data_b = described_class.pack(include_ip = false) { 'B' }
 
     data = {
       'NodeA' => node_data_a,
@@ -11,12 +11,13 @@ describe Marty::Diagnostic::Base do
     }
 
     return data if consistent
-    data + {'NodeB' => node_data_b}
+
+    data + { 'NodeB' => node_data_b }
   end
 
   it 'determines consistency of aggregate diagnostics' do
     a = sample_data
-    b = sample_data(consistent=false)
+    b = sample_data(consistent = false)
 
     expect(described_class.consistent?(a)).to eq(true)
     expect(described_class.consistent?(b)).to eq(false)
@@ -31,20 +32,20 @@ describe Marty::Diagnostic::Base do
       }
     }
 
-    expect(described_class.pack(include_ip=false){'A'}).to eq(expected)
+    expect(described_class.pack(include_ip = false) { 'A' }).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from a Hash' do
     test_a = {
       'ImportantA' => 'A',
       'ImportantB' => 'B',
-      'ImportantC' => 'C'}
+      'ImportantC' => 'C' }
 
     test_b = {
       'ImportantA' => {
-        'description' => 'A', 'status' => true, 'consistent' => nil},
+        'description' => 'A', 'status' => true, 'consistent' => nil },
       'ImportantB' => 'B',
-      'ImportantC' => 'C'}
+      'ImportantC' => 'C' }
 
     expected = {
       'ImportantA' => {
@@ -59,21 +60,21 @@ describe Marty::Diagnostic::Base do
     }
 
     expect(described_class.
-             pack(include_ip=false){test_a}).to eq(expected)
+             pack(include_ip = false) { test_a }).to eq(expected)
     expect(described_class.
-             pack(include_ip=false){test_a}).to eq(expected)
+             pack(include_ip = false) { test_a }).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from an error Hash' do
-    test = described_class.pack(include_ip=false){
+    test = described_class.pack(include_ip = false) do
       described_class.error('E')
-    }
+    end
 
     expected = {
-      "Base"=>{
-        "description"=>"E",
-        "status"=>false,
-        "consistent"=>nil}
+      'Base' => {
+        'description' => 'E',
+        'status' => false,
+        'consistent' => nil }
     }
 
     expect(test).to eq(expected)
@@ -96,7 +97,7 @@ describe Marty::Diagnostic::Base do
       }
     }
 
-    expect{described_class.pack{test_a}}.to raise_error(RuntimeError)
-    expect{described_class.pack{test_b}}.to raise_error(RuntimeError)
+    expect { described_class.pack { test_a } }.to raise_error(RuntimeError)
+    expect { described_class.pack { test_b } }.to raise_error(RuntimeError)
   end
 end

data/spec/other/diagnostic/collection_spec.rb

@@ -2,18 +2,19 @@ require 'spec_helper'
 
 describe Marty::Diagnostic::Collection do
   def sample_data consistent = true
-    node_a_data = described_class.pack(include_ip=false){'A'}
+    node_a_data = described_class.pack(include_ip = false) { 'A' }
     data = {
       'NodeA' => node_a_data,
       'NodeB' => node_a_data,
     }
     return data if consistent
-    data + {'NodeB' => {'Base' => described_class.error('B')}}
+
+    data + { 'NodeB' => { 'Base' => described_class.error('B') } }
   end
 
   it 'all diagnostics in diagnostics class attribute are generated' do
     diags = [Marty::Diagnostic::Version, Marty::Diagnostic::Nodes]
-    expected = diags.map{|d| d.generate}.reduce(:deep_merge)
+    expected = diags.map(&:generate).reduce(:deep_merge)
     described_class.diagnostics = diags
     expect(described_class.generate).to eq(expected)
   end
@@ -21,9 +22,9 @@ describe Marty::Diagnostic::Collection do
   it 'declares data consistency via status consistency' do
     a = sample_data
     b = sample_data + {
-      'NodeB' => described_class.pack(include_ip=false){'B'}
+      'NodeB' => described_class.pack(include_ip = false) { 'B' }
     }
-    c = sample_data(consistent=false)
+    c = sample_data(consistent = false)
 
     expect(described_class.consistent?(a)).to eq(true)
     expect(described_class.consistent?(b)).to eq(true)

data/spec/other/diagnostic/delayed_job_version_spec.rb

@@ -37,7 +37,7 @@ describe Marty::Diagnostic::DelayedJobVersion do
   it 'will fail if DELAYED_VER is not set' do
     ENV.delete('DELAYED_VER')
     start_delayed_job
-    expect{described_class.generate}.to raise_error(RuntimeError)
+    expect { described_class.generate }.to raise_error(RuntimeError)
     stop_delayed_job
   end
 end

data/spec/other/diagnostic/delayed_job_workers_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 require 'job_helper'
 
 describe Marty::Diagnostic::DelayedJobWorkers do
-  def sample_data ip=nil, error=false
+  def sample_data ip = nil, error = false
     {
       ip || Marty::Helper.my_ip => {
         'Delayed Workers / Node' => {
-          'description' => error ? "3" : "4",
+          'description' => error ? '3' : '4',
           'status'      => true,
           'consistent'  => nil
         },
@@ -14,12 +14,12 @@ describe Marty::Diagnostic::DelayedJobWorkers do
     }
   end
 
-  def sample_aggregate error=false
+  def sample_aggregate error = false
     [
-      sample_data(ip='0.0.0.0'),
-      sample_data(ip='0.0.0.1'),
-      sample_data(ip='0.0.0.2', error=error),
-      sample_data(ip='0.0.0.3'),
+      sample_data(ip = '0.0.0.0'),
+      sample_data(ip = '0.0.0.1'),
+      sample_data(ip = '0.0.0.2', error = error),
+      sample_data(ip = '0.0.0.3'),
     ].reduce(:merge)
   end
 
@@ -31,7 +31,7 @@ describe Marty::Diagnostic::DelayedJobWorkers do
 
   it 'can determine if there are nodes with missing workers' do
     consistent   = sample_aggregate
-    inconsistent = sample_aggregate(error=true)
+    inconsistent = sample_aggregate(error = true)
 
     expect(described_class.consistent?(consistent)).to eq(true)
     expect(described_class.consistent?(inconsistent)).to eq(false)

data/spec/other/diagnostic/reporter_spec.rb

@@ -7,19 +7,17 @@ describe Marty::Diagnostic::Reporter do
     attr_accessor :params, :port
   end
 
-  def params diagnostic='base', scope=nil
-    {op: diagnostic, scope: scope}
+  def params diagnostic = 'base', scope = nil
+    { op: diagnostic, scope: scope }
   end
 
   def git
-    begin
       message = `cd #{Rails.root.to_s}; git describe --tags --always;`.strip
-    rescue
-      message = error("Failed accessing git")
-    end
+  rescue StandardError
+      message = error('Failed accessing git')
   end
 
-  def aggregate_data opts={}
+  def aggregate_data opts = {}
     {
       'Dummy' => {
         'NodeA' => {
@@ -33,7 +31,7 @@ describe Marty::Diagnostic::Reporter do
     }
   end
 
-  def aggregate_consistency_data diagnostic='Base'
+  def aggregate_consistency_data diagnostic = 'Base'
     original_a = Marty::Diagnostic::Base.create_info('A')
     original_b = Marty::Diagnostic::Base.create_info('B')
 
@@ -75,12 +73,12 @@ describe Marty::Diagnostic::Reporter do
       expected = {
         diagnostic => {
           'NodeA' => {
-            'CONSTANTA' => original_a + {'consistent' => true},
+            'CONSTANTA' => original_a + { 'consistent' => true },
             'CONSTANTB' => inconsistent_b,
             'CONSTANTB2' => inconsistent_b,
           },
           'NodeB' => {
-            'CONSTANTA' => original_a + {'consistent' => true},
+            'CONSTANTA' => original_a + { 'consistent' => true },
             'CONSTANTB' => inconsistent_c,
             'CONSTANTB2' => inconsistent_c,
           },
@@ -95,18 +93,18 @@ describe Marty::Diagnostic::Reporter do
   end
 
   def version_data consistent = true
-    Marty::Diagnostic::Base.pack(include_ip=false){
+    Marty::Diagnostic::Base.pack(include_ip = false) do
       {
-        "Marty"    => info(Marty::VERSION, true, consistent),
-        "Delorean" => info(Delorean::VERSION, true, true),
-        "Mcfly"    => info(Mcfly::VERSION, true, true),
-        "Git"      => info(git, true, true),
+        'Marty'    => info(Marty::VERSION, true, consistent),
+        'Delorean' => info(Delorean::VERSION, true, true),
+        'Mcfly'    => info(Mcfly::VERSION, true, true),
+        'Git'      => info(git, true, true),
       }
-    }
+    end
   end
 
   def minimize(str)
-    str.gsub(/\s+/, "")
+    str.gsub(/\s+/, '')
   end
 
   describe 'display mechanism for version diagnostic' do
@@ -119,7 +117,7 @@ describe Marty::Diagnostic::Reporter do
     end
 
     it 'masks consistent nodes for display (version)' do
-      described_class.request.params = params(scope='local')
+      described_class.request.params = params(scope = 'local')
       data = {
         'Version' => {
           'NodeA' => version_data,
@@ -164,18 +162,18 @@ describe Marty::Diagnostic::Reporter do
 
     it 'displays all nodes when there is an inconsistent node (version)' do
      Marty:: Diagnostic::Reporter.request.params = params
-      bad_ver = '0.0.0'
-
-      data = {
-        'Version' => {
-          'NodeA' => version_data(consistent=false),
-          'NodeB' => version_data + {
-            'Marty' => Marty::Diagnostic::Base.create_info(bad_ver, true, false)
-          },
-        }
-      }
-
-      expected = <<-ERB
+     bad_ver = '0.0.0'
+
+     data = {
+       'Version' => {
+         'NodeA' => version_data(consistent = false),
+         'NodeB' => version_data + {
+           'Marty' => Marty::Diagnostic::Base.create_info(bad_ver, true, false)
+         },
+       }
+     }
+
+     expected = <<-ERB
       <h3>Version</h3>
       <h3 class="error">Inconsistency Detected </h3>
       <div class="wrapper">
@@ -207,10 +205,10 @@ describe Marty::Diagnostic::Reporter do
           </tr>
       </table>
       </div>
-      ERB
+     ERB
 
-      test = described_class.displays(data)
-      expect(minimize(test)).to eq(minimize(expected))
+     test = described_class.displays(data)
+     expect(minimize(test)).to eq(minimize(expected))
     end
 
     it 'can detect errors in diagnostic for display and api' do