marty 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8178a6b1a8ee6a92bfe1ddc4c3cae736c023f958
-  data.tar.gz: 2266f831f31d5ba5ae669967dcc30fe138cc539c
+  metadata.gz: bbf4105fb28ba2f431e2b8a8e0e68f6774ff6792
+  data.tar.gz: 20367feadccdd5e9de0e441837da1ee8916f5838
 SHA512:
-  metadata.gz: efaf4082e86a48ebca8273b493fa0736b54725bb5e8cc6d4000d1cef78162c8fb68615216c5432fe7adb0f5e367d62a026f08c9404e1a12c76f6195597ebe717
-  data.tar.gz: 3a5fa3ada0971c0caf898a874f84b67b175e68d3aab088cca2832e8a9d865ebfe31abe4f1e9e0c6b159fd0a035a6ea6a7f0a9ae9baa9f6ca01f84bd3f1b64ac7
+  metadata.gz: 4f5617f786e53cf0e543a1594c7d50022b4b55bb25be508c9ec5ffd4a9ca4b1a5b4de4968151d022bd11f8f6b4efdec9a8c2bf1cd29138cb59ed4625b6a41a36
+  data.tar.gz: 5cddaced6b94fcdfdc9d42c2d6723137a36967022d59f0da2a2792f6968ceb1b27efb8ad95f1573c3265626d124fcf13ceb90677c3d3a83f7f3f2d644ea6fae6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.1.8)
+    marty (1.1.9)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.33)

data/app/controllers/marty/diagnostic/controller.rb

@@ -0,0 +1,40 @@
+module Marty::Diagnostic; class Controller < ActionController::Base
+  def self.inherited(klass)
+    Reporter.namespaces.unshift(klass.name.deconstantize)
+    super
+  end
+
+  def op
+    begin
+      @result = Reporter.run(request)
+    rescue NameError
+      render file: 'public/400', formats: [:html], status: 400, layout: false
+    else
+      respond_to do |format|
+        format.html {@result = display_parameters}
+        format.json {render json: process_result_for_api}
+      end
+    end
+  end
+
+  def process_result_for_api
+    @result.delete('data') unless request.params['data'] == 'true'
+    @result.delete('errors') if @result['errors'] && @result['errors'].empty?
+    @result
+  end
+
+  def display_parameters
+    local  = params[:scope] == 'local'
+    data   = local ? @result : @result['data']
+    errors = local ? Reporter.errors(data) : @result['errors']
+    {
+      'display' => Reporter.displays(data),
+      'errors' => errors
+    }
+  end
+
+  def self.add_report name, diagnostics
+    Reporter.reports[name] = diagnostics
+  end
+end
+end

data/app/models/{diagnostic → marty/diagnostic}/aws/ec2_instance.rb

@@ -1,4 +1,4 @@
-class Diagnostic::Aws::Ec2Instance
+class Marty::Diagnostic::Aws::Ec2Instance
   attr_reader :id, :doc, :role, :creds, :version, :host, :tag, :nodes
 
   # aws reserved host used to get instance meta-data

data/app/models/{diagnostic → marty/diagnostic}/base.rb

@@ -1,5 +1,5 @@
-class Diagnostic::Base < Diagnostic::Request
-  extend Diagnostic::Packer
+module Marty::Diagnostic; class Base < Request
+  extend Packer
   include ActionView::Helpers::TextHelper
 
   # all diagnostics have `aggregatable` set to true.
@@ -10,16 +10,16 @@ class Diagnostic::Base < Diagnostic::Request
   self.aggregatable = true
   self.status_only = false
 
-  @@read_only = Marty::Util.db_in_recovery?
+  @@read_only = Util.db_in_recovery?
   @@template  = ActionController::Base.new.lookup_context.
-                find_template("marty/diagnostic/diag").identifier
+                    find_template("marty/diagnostic/diag").identifier
 
   def self.generate
     raise "generate has not been defined for #{name}"
   end
 
   def self.fatal?
-    name == 'Diagnostic::Fatal'
+    name.include?('Fatal')
   end
 
   def self.process_status_only infos
@@ -67,3 +67,4 @@ class Diagnostic::Base < Diagnostic::Request
     new.simple_format(info ? info['description'] : 'N/A')
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/collection.rb

@@ -1,4 +1,4 @@
-class Diagnostic::Collection < Diagnostic::Base
+module Marty::Diagnostic; class Collection < Base
   class_attribute :diagnostics
   self.diagnostics = []
   self.status_only = true
@@ -8,3 +8,4 @@ class Diagnostic::Collection < Diagnostic::Base
     diagnostics.map{|d| d.generate}.reduce(:deep_merge)
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/delayed_job.rb

@@ -5,7 +5,7 @@
 # `DELAYED_VER` environment variable should be set in the
 # delayed jobs initializer.
 #
-class Diagnostic::DelayedJob < Diagnostic::Base
+module Marty::Diagnostic; class DelayedJob < Base
   self.aggregatable = false
 
   def self.generate
@@ -42,7 +42,9 @@ class Diagnostic::DelayedJob < Diagnostic::Base
   end
 
   def self.delayed_worker_count
-    Diagnostic::Node.get_postgres_connections[Diagnostic::Database.db_name].
+    db = Database.db_name
+    Node.get_postgres_connections[db].
       count{|conn| conn['application_name'].include?('delayed_job')}
   end
 end
+end

data/app/models/{diagnostic/env.rb → marty/diagnostic/environment_variables.rb}

@@ -1,5 +1,5 @@
-class Diagnostic::Env < Diagnostic::Base
-  def self.environment_variables filter=''
+module Marty::Diagnostic; class EnvironmentVariables < Base
+  def self.env filter=''
     env = ENV.clone
 
     # obfuscate SECRET_KEY_BASE for comparison
@@ -16,7 +16,7 @@ class Diagnostic::Env < Diagnostic::Base
 
   def self.generate
     pack do
-      environment_variables
+      env
     end
   end
 
@@ -33,3 +33,4 @@ class Diagnostic::Env < Diagnostic::Base
     }
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/fatal.rb

@@ -1,12 +1,13 @@
-class Diagnostic::Fatal < Diagnostic::Base
+module Marty::Diagnostic; class Fatal < Base
   def self.display_alert_message
     '<h3 class="error">Something went wrong.</br>'\
     'Consistency is checked between remaining nodes if applicable.</h3>'
   end
 
   def self.message msg, opts = {}
-    node = opts[:node] || Diagnostic::Node.my_ip
+    node = opts[:node] || Node.my_ip
     type = opts[:type] || 'RuntimeError'
-    {name => {node => {type => error(msg)}}}
+    {name.demodulize => {node => {type => error(msg)}}}
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/nodes.rb

@@ -1,13 +1,15 @@
-class Diagnostic::Nodes < Diagnostic::Base
+require_relative 'aws/ec2_instance'
+
+module Marty::Diagnostic; class Nodes < Base
   def self.generate
     pack do
       begin
-        a_nodes = Diagnostic::Aws::Ec2Instance.new.nodes.sort if
-          Diagnostic::Aws::Ec2Instance.is_aws?
+        a_nodes = Aws::Ec2Instance.new.nodes.sort if
+          Aws::Ec2Instance.is_aws?
       rescue => e
         a_nodes = [e.message]
       end
-      pg_nodes = Diagnostic::Node.get_nodes.sort
+      pg_nodes = Node.get_nodes.sort
       a_nodes.nil? || pg_nodes == a_nodes ? pg_nodes.join("\n") :
         error("There is a discrepancy between nodes connected to "\
               "Postgres and those discovered through AWS EC2.\n"\
@@ -16,3 +18,4 @@ class Diagnostic::Nodes < Diagnostic::Base
     end
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/reporter.rb

@@ -1,8 +1,9 @@
-class Diagnostic::Reporter < Diagnostic::Request
-  class_attribute :reports, :diagnostics
+module Marty::Diagnostic; class Reporter < Request
+  class_attribute :reports, :diagnostics, :namespaces
 
   self.reports = {}
   self.diagnostics = []
+  self.namespaces = ['Marty']
 
   def self.run request
     self.request = request
@@ -17,9 +18,16 @@ class Diagnostic::Reporter < Diagnostic::Request
   end
 
   private
-  def self.resolve_diagnostic name
-    return name.constantize unless name.slice('Diagnostic::').nil?
-    ('Diagnostic::' + name.downcase.camelize).constantize
+  def self.resolve_diagnostic diag_name
+    diag_name = diag_name.camelize
+    klass = nil
+    self.namespaces.each do |n|
+      klass = (n + '::Diagnostic::' + diag_name).constantize rescue nil
+      break if klass
+    end
+    raise NameError.new("#{diag_name} could not be resolved by #{name}") if
+      klass.nil?
+    klass
   end
 
   def self.unresolve_diagnostic klass
@@ -30,9 +38,9 @@ class Diagnostic::Reporter < Diagnostic::Request
     diagnostics.each_with_object({}){
       |d, h|
       begin
-        h[d.name] = d.generate
+        h[d.name.demodulize] = d.generate
       rescue => e
-        h.deep_merge!(Diagnostic::Fatal.message(e.message, type: d.name))
+        h.deep_merge!(Fatal.message(e.message, type: d.name.demodulize))
       end
     }
   end
@@ -73,7 +81,7 @@ class Diagnostic::Reporter < Diagnostic::Request
     ops = diagnostics.map{|d| unresolve_diagnostic(d) if d.aggregatable}.compact
     return {} if ops.empty?
 
-    nodes = Diagnostic::Node.get_nodes - [Diagnostic::Node.my_ip]
+    nodes = Node.get_nodes - [Node.my_ip]
     remote = nodes.sort.map do |n|
       Thread.new do
         uri = Addressable::URI.new(host: n, port: request.port)
@@ -92,13 +100,9 @@ class Diagnostic::Reporter < Diagnostic::Request
           response = req.start {|http| http.get(uri.to_s)}
           next JSON.parse(response.body) if response.code == "200"
 
-          Diagnostic::Fatal.message(response.body,
-                                    type: response.message,
-                                    node: uri.host)
+          Fatal.message(response.body, type: response.message, node: uri.host)
         rescue => e
-          Diagnostic::Fatal.message(e.message,
-                                    type: e.class,
-                                    node: uri.host)
+          Fatal.message(e.message, type: e.class, node: uri.host)
         end
       end
     end
@@ -106,3 +110,4 @@ class Diagnostic::Reporter < Diagnostic::Request
     remote.empty? ? {} : remote.map(&:join).map(&:value).reduce(:deep_merge)
   end
 end
+end

data/app/models/{diagnostic → marty/diagnostic}/request.rb

@@ -1,4 +1,4 @@
-class Diagnostic::Request
+module Marty::Diagnostic; class Request
   def self.request
     raise 'Request object has not been been injected into #{name}' unless
       @@request
@@ -26,3 +26,4 @@ class Diagnostic::Request
     request.port == 443
   end
 end
+end

data/app/models/{diagnostic/environment.rb → marty/diagnostic/version.rb}

@@ -1,35 +1,34 @@
-class Diagnostic::Environment < Diagnostic::Base
+module Marty::Diagnostic; class Version < Base
   def self.generate
     pack do
+      begin
+        message = `cd #{Rails.root.to_s}; git describe --tags --always;`.strip
+      rescue
+        message = error("Failed accessing git")
+      end
       rbv = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
       {
-        'Environment'             => Rails.env,
+        'Marty'                   => Marty::VERSION,
+        'Delorean'                => Delorean::VERSION,
+        'Mcfly'                   => Mcfly::VERSION,
+        'Git'                     => message,
         'Rails'                   => Rails.version,
         'Netzke Core'             => Netzke::Core::VERSION,
         'Netzke Basepack'         => Netzke::Basepack::VERSION,
         'Ruby'                    => rbv,
         'RubyGems'                => Gem::VERSION,
-        'Database Adapter'        => Diagnostic::Database.db_adapter_name,
-        'Database Server'         => Diagnostic::Database.db_server_name,
-        'Database Version'        => db_version,
-        'Database Schema Version' => db_schema
+        'Database Schema Version' => db_schema,
+        'Environment'             => Rails.env,
       }
     end
   end
 
-  def self.db_version
-    begin
-      Diagnostic::Database.db_version
-    rescue => e
-      error(e.message)
-    end
-  end
-
   def self.db_schema
     begin
-      Diagnostic::Database.db_schema
+      Database.db_schema
     rescue => e
       error(e.message)
     end
   end
 end
+end

data/app/models/marty/helper.rb

@@ -10,4 +10,12 @@ class Marty::Helper
     |rstart, rend, step|
     (rstart..rend).step(step).to_a
   end
+
+  delorean_fn :my_ip, sig:0 do
+    Marty::Diagnostic::Node.my_ip
+  end
+
+  delorean_fn :git, sig:0 do
+    [my_ip, ENV['DELAYED_VER']]
+  end
 end

data/config/routes.rb

@@ -6,5 +6,5 @@ Marty::Engine.routes.draw do
   match via: [:get, :post], "rpc/:action(.:format)" => "rpc", as: :rpc
   get "job/:action" => "job", as: :job
   match via: [:get, :post], "report(.:format)" => "report#index", as: :report
-  get  'diag', to: 'diagnostic#op'
+  get  'diag', to: 'diagnostic/#op'
 end

data/delorean/diagnostics.dl

@@ -3,7 +3,7 @@ Delay:
     # the delay parameter delays the next created job so that a different
     # worker is more likely to claim it
     delay  =? 2.6
-    ver    = Marty::Helper.sleep(delay) && Diagnostic::Helper.git
+    ver    = Marty::Helper.sleep(delay) && Marty::Helper.git
     res    = [(Delay() | "ver") for i in Marty::Helper.range_step(0, count, 1)]
     result = [r.to_a for r in res]
 

data/lib/{diagnostic → marty/diagnostic}/database.rb

@@ -1,4 +1,4 @@
-module Diagnostic::Database
+module Marty::Diagnostic::Database
   def self.db_name
     ActiveRecord::Base.connection_config[:database]
   end
@@ -23,6 +23,6 @@ module Diagnostic::Database
     current = ActiveRecord::Migrator.current_version
     raise "Migration is needed.\nCurrent Version: #{current}" if
       ActiveRecord::Migrator.needs_migration?
-    current
+    current.to_s
   end
 end

data/lib/{diagnostic → marty/diagnostic}/node.rb

@@ -1,4 +1,4 @@
-module Diagnostic::Node
+module Marty::Diagnostic::Node
   def self.my_ip
     begin
       Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
@@ -21,7 +21,7 @@ module Diagnostic::Node
   end
 
   def self.get_target_connections target
-    get_postgres_connections[Diagnostic::Database.db_name].select{|conn|
+    get_postgres_connections[Marty::Diagnostic::Database.db_name].select{|conn|
       conn['application_name'].include?(target)
     }.map{|conn|
       conn['client_addr'] == '127.0.0.1' ? my_ip : conn['client_addr']

data/lib/{diagnostic → marty/diagnostic}/packer.rb

@@ -1,4 +1,4 @@
-module Diagnostic::Packer
+module Marty::Diagnostic; module Packer
   # expects a block that returns either a String or a Hash value and formats
   # it into a diagnostic info object.
   def pack include_ip=true
@@ -10,22 +10,19 @@ module Diagnostic::Packer
                  data.each_with_object({}) do
                  |(key, value), hash|
                  case value
-                 when String
-                   hash[key] = create_info(value)
                  when Hash
                    raise "Invalid Diagnostic Info #{value}" unless
                      is_valid_info?(value)
 
                    hash[key] = value
+                 else
+                   hash[key] = create_info(value.to_s)
                  end
                end
-             when String
-               {name.demodulize => create_info(data)}
              else
-               raise "Invalid Data Type: (#{data}, #{data.class}) "\
-                     "`package` expects a String or Hash value."
+               {name.demodulize => create_info(data.to_s)}
              end
-      include_ip ? {Diagnostic::Node.my_ip => info} : info
+      include_ip ? {Node.my_ip => info} : info
     end
   end
 
@@ -45,3 +42,4 @@ module Diagnostic::Packer
     create_info(description, false)
   end
 end
+end

data/lib/marty/monkey.rb

@@ -239,7 +239,11 @@ module ActiveRecord
       def pg_enum(*args)
         options = args.extract_options!
         column_names = args
-        column_names.each { |name| column(name, name.to_s.pluralize, options) }
+
+        enum = options.delete(:enum)
+
+        column_names.each { |name|
+          column(name, enum || name.to_s.pluralize, options) }
       end
     end
     module PostgreSQL

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

data/spec/controllers/diagnostic/controller_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+# used for testing controller inheritance
+module Test
+  module Diagnostic; end
+end
+
+module Marty::Diagnostic
+  RSpec.describe Controller, type: :controller do
+    before(:each) { @routes = Marty::Engine.routes }
+    let(:json_response) { JSON.parse(response.body) }
+
+    def my_ip
+      Node.my_ip
+    end
+
+    def git
+      `cd #{Rails.root.to_s}; git describe --tags --always;`.
+        strip rescue "Failed accessing git"
+    end
+
+    describe 'GET #op' do
+      it 'returns http success' do
+        get :op, format: :json, op: 'version'
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'a request injects the request object into Diagnostic classes' do
+        get :op, format: :json, op: 'version'
+        expect(Reporter.request).not_to eq(nil)
+      end
+
+      it 'returns the current version JSON' do
+        get :op, format: :json, op: 'version', data: 'true'
+
+        # generate version data and declare all values consistent
+        versions = Version.generate.each_with_object({}){
+          |(n, v),h|
+          h[n] = v.each{|t, r| r['consistent'] = true}
+        }
+
+        expected = {
+          'data' => {
+            'Version' => versions
+          }
+        }
+
+        expect(assigns('result')).to eq(expected)
+      end
+
+      it 'returns the expected cummulative diagnostic' do
+        expected = {
+          "data" => {
+            "Version" => {
+              my_ip => {
+                "Marty" => {
+                  "description" => Marty::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Delorean" => {
+                  "description" => Delorean::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Mcfly" => {
+                  "description" => Mcfly::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Git" => {
+                  "description" => git,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Rails" => {
+                  "description" => Rails.version,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Netzke Core" => {
+                  "description" => Netzke::Core::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Netzke Basepack" => {
+                  "description" => Netzke::Basepack::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Ruby" => {
+                  "description" => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} "\
+                                   "(#{RUBY_PLATFORM})",
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "RubyGems" => {
+                  "description" => Gem::VERSION,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Database Schema Version" => {
+                  "description" => Database.db_schema,
+                  "status"      => true,
+                  "consistent"  => true
+                },
+                "Environment" => {
+                  "description" => Rails.env,
+                  "status"      => true,
+                  "consistent"  => true
+                }
+              }
+            },
+            "EnvironmentVariables" => {
+              my_ip => {
+              }
+            },
+            "Nodes" => {
+              my_ip => {
+                "Nodes"=> {
+                  "description" => my_ip,
+                  "status"      => true,
+                  "consistent"  => true
+                }
+              }
+            }
+          }
+        }
+
+        get :op,
+            format: :json,
+            op: 'version, environment_variables, nodes',
+            data: 'true'
+
+        expect(JSON.parse(response.body)).to eq(expected)
+      end
+    end
+
+    describe 'Inheritance behavior' do
+      it 'appends namespace to reporter and resolves in order of inheritance' do
+        class Test::SomeController < Controller; end
+        expect(Reporter.namespaces).to include('Test')
+
+        class Test::Diagnostic::Version; end
+        expect(Reporter.resolve_diagnostic('Version').name).
+          to include('Test')
+
+        Reporter.namespaces.shift
+      end
+    end
+  end
+end

data/spec/models/diagnostic/base_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Diagnostic::Base do
+describe Marty::Diagnostic::Base do
   def sample_data consistent=true
-    node_data_a = Diagnostic::Base.pack(include_ip=false){'A'}
-    node_data_b = Diagnostic::Base.pack(include_ip=false){'B'}
+    node_data_a = Marty::Diagnostic::Base.pack(include_ip=false){'A'}
+    node_data_b = Marty::Diagnostic::Base.pack(include_ip=false){'B'}
 
     data = {
       'NodeA' => node_data_a,
@@ -18,8 +18,8 @@ describe Diagnostic::Base do
     a = sample_data
     b = sample_data(consistent=false)
 
-    expect(Diagnostic::Base.consistent?(a)).to eq(true)
-    expect(Diagnostic::Base.consistent?(b)).to eq(false)
+    expect(Marty::Diagnostic::Base.consistent?(a)).to eq(true)
+    expect(Marty::Diagnostic::Base.consistent?(b)).to eq(false)
   end
 
   it 'can produce a valid diagnostic hash from a String' do
@@ -31,7 +31,7 @@ describe Diagnostic::Base do
       }
     }
 
-    expect(Diagnostic::Base.pack(include_ip=false){'A'}).to eq(expected)
+    expect(Marty::Diagnostic::Base.pack(include_ip=false){'A'}).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from a Hash' do
@@ -58,13 +58,15 @@ describe Diagnostic::Base do
       },
     }
 
-    expect(Diagnostic::Base.pack(include_ip=false){test_a}).to eq(expected)
-    expect(Diagnostic::Base.pack(include_ip=false){test_a}).to eq(expected)
+    expect(Marty::Diagnostic::Base.
+             pack(include_ip=false){test_a}).to eq(expected)
+    expect(Marty::Diagnostic::Base.
+             pack(include_ip=false){test_a}).to eq(expected)
   end
 
   it 'can produce a valid diagnostic hash from an error Hash' do
-    test = Diagnostic::Base.pack(include_ip=false){
-      Diagnostic::Base.error('E')
+    test = Marty::Diagnostic::Base.pack(include_ip=false){
+      Marty::Diagnostic::Base.error('E')
     }
 
     expected = {
@@ -81,7 +83,9 @@ describe Diagnostic::Base do
     test_a = {
       'ImportantA' => 'A',
       'ImportantB' => 'B',
-      'ImportantC' => Diagnostic::Base.create_info('C') + {'extra' => 'D'}
+      'ImportantC' => Marty::Diagnostic::Base.create_info('C') + {
+        'extra' => 'D'
+      }
     }
 
     test_b = {
@@ -92,7 +96,7 @@ describe Diagnostic::Base do
       }
     }
 
-    expect{Diagnostic::Base.pack{test_a}}.to raise_error(RuntimeError)
-    expect{Diagnostic::Base.pack{test_b}}.to raise_error(RuntimeError)
+    expect{Marty::Diagnostic::Base.pack{test_a}}.to raise_error(RuntimeError)
+    expect{Marty::Diagnostic::Base.pack{test_b}}.to raise_error(RuntimeError)
   end
 end

data/spec/models/diagnostic/collection_spec.rb

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

data/spec/models/diagnostic/delayed_job_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'job_helper'
 
-describe Diagnostic::DelayedJob do
+describe Marty::Diagnostic::DelayedJob do
   # used to stub request object
   class DummyRequest
     attr_accessor :params, :port
@@ -12,12 +12,12 @@ describe Diagnostic::DelayedJob do
 
   before(:each) do
     Marty::Script.load_scripts(nil, Date.today)
-    allow(Diagnostic::DelayedJob).to receive(:scope).and_return(nil)
+    allow(Marty::Diagnostic::DelayedJob).to receive(:scope).and_return(nil)
   end
 
   def sample_data
     {
-      Diagnostic::Helper.my_ip => {
+      Marty::Helper.my_ip => {
         'Version' => {
           'description' => Marty::VERSION,
           'status'      => true,
@@ -30,14 +30,14 @@ describe Diagnostic::DelayedJob do
   it 'can detect if all workers are running correct application version' do
     ENV['DELAYED_VER'] = Marty::VERSION
     start_delayed_job
-    expect(Diagnostic::DelayedJob.generate).to eq(sample_data)
+    expect(Marty::Diagnostic::DelayedJob.generate).to eq(sample_data)
     stop_delayed_job
   end
 
   it 'will fail if DELAYED_VER is not set' do
     ENV.delete('DELAYED_VER')
     start_delayed_job
-    expect{Diagnostic::DelayedJob.generate}.to raise_error(RuntimeError)
+    expect{Marty::Diagnostic::DelayedJob.generate}.to raise_error(RuntimeError)
     stop_delayed_job
   end
 end

data/spec/models/diagnostic/reporter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'job_helper'
 
-describe Diagnostic::Reporter do
+describe Marty::Diagnostic::Reporter do
   # used to stub request object
   class DummyRequest
     attr_accessor :params, :port
@@ -21,7 +21,7 @@ describe Diagnostic::Reporter do
 
   def aggregate_data opts={}
     {
-      'Diagnostic::Dummy' => {
+      'Dummy' => {
         'NodeA' => {
           'ImportantTest' => {
             'description' => 'A',
@@ -34,8 +34,8 @@ describe Diagnostic::Reporter do
   end
 
   def aggregate_consistency_data diagnostic='Base'
-    original_a = Diagnostic::Base.create_info('A')
-    original_b = Diagnostic::Base.create_info('B')
+    original_a = Marty::Diagnostic::Base.create_info('A')
+    original_b = Marty::Diagnostic::Base.create_info('B')
 
     data = {
       'CONSTANTA' => original_a,
@@ -43,11 +43,10 @@ describe Diagnostic::Reporter do
       'CONSTANTB2' => original_b,
     }
 
-    different_b = Diagnostic::Base.create_info('C')
+    different_b = Marty::Diagnostic::Base.create_info('C')
 
-    key = "Diagnostic::" + diagnostic
     test = {
-      key => {
+      diagnostic => {
         'NodeA' => data,
         'NodeB' => data + {
           'CONSTANTB' => different_b,
@@ -56,12 +55,12 @@ describe Diagnostic::Reporter do
       }
     }
 
-    inconsistent_b = Diagnostic::Base.create_info('B', true, false)
-    inconsistent_c = Diagnostic::Base.create_info('C', true, false)
+    inconsistent_b = Marty::Diagnostic::Base.create_info('B', true, false)
+    inconsistent_c = Marty::Diagnostic::Base.create_info('C', true, false)
 
-    if diagnostic == 'Env'
+    if diagnostic == 'EnvironmentVariables'
       expected = {
-        key => {
+        diagnostic => {
           'NodeA' => {
             'CONSTANTB' => inconsistent_b,
             'CONSTANTB2' => inconsistent_b,
@@ -74,7 +73,7 @@ describe Diagnostic::Reporter do
       }
     else
       expected = {
-        key => {
+        diagnostic => {
           'NodeA' => {
             'CONSTANTA' => original_a + {'consistent' => true},
             'CONSTANTB' => inconsistent_b,
@@ -92,11 +91,11 @@ describe Diagnostic::Reporter do
   end
 
   def info v, status, consistent
-    Diagnostic::Base.create_info(v, status, consistent)
+    Marty::Diagnostic::Base.create_info(v, status, consistent)
   end
 
   def version_data consistent = true
-    Diagnostic::Base.pack(include_ip=false){
+    Marty::Diagnostic::Base.pack(include_ip=false){
       {
         "Marty"    => info(Marty::VERSION, true, consistent),
         "Delorean" => info(Delorean::VERSION, true, true),
@@ -112,17 +111,17 @@ describe Diagnostic::Reporter do
 
   describe 'display mechanism for version diagnostic' do
     before(:all) do
-      Diagnostic::Reporter.diagnostics = [Diagnostic::Version]
+      Marty::Diagnostic::Reporter.diagnostics = [Marty::Diagnostic::Version]
     end
 
     before(:each) do
-      Diagnostic::Reporter.request = DummyRequest.new
+      Marty::Diagnostic::Reporter.request = DummyRequest.new
     end
 
     it 'masks consistent nodes for display (version)' do
-      Diagnostic::Reporter.request.params = params(scope='local')
+      Marty::Diagnostic::Reporter.request.params = params(scope='local')
       data = {
-        'Diagnostic::Version' => {
+        'Version' => {
           'NodeA' => version_data,
           'NodeB' => version_data,
         }
@@ -159,19 +158,19 @@ describe Diagnostic::Reporter do
       </div>
       ERB
 
-      test = Diagnostic::Reporter.displays(data)
+      test = Marty::Diagnostic::Reporter.displays(data)
       expect(minimize(test)).to eq(minimize(expected))
     end
 
     it 'displays all nodes when there is an inconsistent node (version)' do
-      Diagnostic::Reporter.request.params = params
+     Marty:: Diagnostic::Reporter.request.params = params
       bad_ver = '0.0.0'
 
       data = {
-        'Diagnostic::Version' => {
+        'Version' => {
           'NodeA' => version_data(consistent=false),
           'NodeB' => version_data + {
-            'Marty' => Diagnostic::Base.create_info(bad_ver, true, false)
+            'Marty' => Marty::Diagnostic::Base.create_info(bad_ver, true, false)
           },
         }
       }
@@ -210,41 +209,41 @@ describe Diagnostic::Reporter do
       </div>
       ERB
 
-      test = Diagnostic::Reporter.displays(data)
+      test = Marty::Diagnostic::Reporter.displays(data)
       expect(minimize(test)).to eq(minimize(expected))
     end
 
     it 'can detect errors in diagnostic for display and api' do
-      Diagnostic::Reporter.request.params = params
+      Marty::Diagnostic::Reporter.request.params = params
       n  = aggregate_data
       e  = aggregate_data(status: false)
       c  = aggregate_data(consistent: false)
       ce = aggregate_data(status: false, consistent: false)
 
       aggregate_failures do
-        expect(Diagnostic::Reporter.errors(n)).to eq({})
-        expect(Diagnostic::Reporter.errors(e)).not_to eq({})
-        expect(Diagnostic::Reporter.errors(c)).not_to eq({})
-        expect(Diagnostic::Reporter.errors(ce)).not_to eq({})
+        expect(Marty::Diagnostic::Reporter.errors(n)).to eq({})
+        expect(Marty::Diagnostic::Reporter.errors(e)).not_to eq({})
+        expect(Marty::Diagnostic::Reporter.errors(c)).not_to eq({})
+        expect(Marty::Diagnostic::Reporter.errors(ce)).not_to eq({})
       end
     end
 
     it 'can survive and display fatal errors' do
-      Diagnostic::Reporter.request.params = params
+      Marty::Diagnostic::Reporter.request.params = params
 
-      a_err_a = Diagnostic::Fatal.message('A',
-                                          node: 'NodeA')
+      a_err_a = Marty::Diagnostic::Fatal.message('A',
+                                                 node: 'NodeA')
 
-      a_err_b = Diagnostic::Fatal.message('B',
-                                          node: 'NodeA')
+      a_err_b = Marty::Diagnostic::Fatal.message('B',
+                                                 node: 'NodeA')
 
-      b_err_c = Diagnostic::Fatal.message('C',
-                                          node: 'NodeB',
-                                          type: 'OtherError')
+      b_err_c = Marty::Diagnostic::Fatal.message('C',
+                                                 node: 'NodeB',
+                                                 type: 'OtherError')
 
-      c_err_d = Diagnostic::Fatal.message('D',
-                                          node: 'NodeC',
-                                          type: 'OtherOtherError')
+      c_err_d = Marty::Diagnostic::Fatal.message('D',
+                                                 node: 'NodeC',
+                                                 type: 'OtherOtherError')
 
       data = [a_err_a, a_err_b, b_err_c, c_err_d].reduce(:deep_merge)
 
@@ -300,20 +299,20 @@ describe Diagnostic::Reporter do
       </h3>
       ERB
 
-      result = Diagnostic::Reporter.displays(data)
+      result = Marty::Diagnostic::Reporter.displays(data)
       expect(minimize(result)).to eq(minimize(expected))
     end
   end
 
   describe 'aggregation consistency functionality' do
     it 'env diagnostic' do
-      test, expected = aggregate_consistency_data('Env')
-      expect(Diagnostic::Reporter.consistency(test)).to eq(expected)
+      test, expected = aggregate_consistency_data('EnvironmentVariables')
+      expect(Marty::Diagnostic::Reporter.consistency(test)).to eq(expected)
     end
 
     it 'marks data as consistent/inconsistent' do
       test, expected = aggregate_consistency_data
-      expect(Diagnostic::Reporter.consistency(test)).to eq(expected)
+      expect(Marty::Diagnostic::Reporter.consistency(test)).to eq(expected)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -404,30 +404,27 @@ files:
 - app/components/marty/user_view.rb
 - app/controllers/marty/application_controller.rb
 - app/controllers/marty/components_controller.rb
-- app/controllers/marty/diagnostic_controller.rb
+- app/controllers/marty/diagnostic/controller.rb
 - app/controllers/marty/job_controller.rb
 - app/controllers/marty/report_controller.rb
 - app/controllers/marty/rpc_controller.rb
 - app/helpers/marty/application_helper.rb
 - app/helpers/marty/script_set.rb
-- app/models/diagnostic/aws/ec2_instance.rb
-- app/models/diagnostic/base.rb
-- app/models/diagnostic/base_collection.rb
-- app/models/diagnostic/collection.rb
-- app/models/diagnostic/delayed_job.rb
-- app/models/diagnostic/env.rb
-- app/models/diagnostic/environment.rb
-- app/models/diagnostic/fatal.rb
-- app/models/diagnostic/helper.rb
-- app/models/diagnostic/nodes.rb
-- app/models/diagnostic/reporter.rb
-- app/models/diagnostic/request.rb
-- app/models/diagnostic/version.rb
 - app/models/marty/api_auth.rb
 - app/models/marty/api_config.rb
 - app/models/marty/base.rb
 - app/models/marty/config.rb
 - app/models/marty/data_grid.rb
+- app/models/marty/diagnostic/aws/ec2_instance.rb
+- app/models/marty/diagnostic/base.rb
+- app/models/marty/diagnostic/collection.rb
+- app/models/marty/diagnostic/delayed_job.rb
+- app/models/marty/diagnostic/environment_variables.rb
+- app/models/marty/diagnostic/fatal.rb
+- app/models/marty/diagnostic/nodes.rb
+- app/models/marty/diagnostic/reporter.rb
+- app/models/marty/diagnostic/request.rb
+- app/models/marty/diagnostic/version.rb
 - app/models/marty/enum.rb
 - app/models/marty/enum_event_operation.rb
 - app/models/marty/event.rb
@@ -499,15 +496,15 @@ files:
 - delorean/diagnostics.dl
 - delorean/script_report.dl
 - gemini_deprecations.md
-- lib/diagnostic/database.rb
-- lib/diagnostic/node.rb
-- lib/diagnostic/packer.rb
 - lib/marty.rb
 - lib/marty/content_handler.rb
 - lib/marty/data_change.rb
 - lib/marty/data_conversion.rb
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
+- lib/marty/diagnostic/database.rb
+- lib/marty/diagnostic/node.rb
+- lib/marty/diagnostic/packer.rb
 - lib/marty/engine.rb
 - lib/marty/json_schema.rb
 - lib/marty/lazy_column_loader.rb
@@ -533,7 +530,7 @@ files:
 - marty.gemspec
 - script/rails
 - spec/controllers/application_controller_spec.rb
-- spec/controllers/diagnostic_controller_spec.rb
+- spec/controllers/diagnostic/controller_spec.rb
 - spec/controllers/job_controller_spec.rb
 - spec/controllers/rpc_controller_spec.rb
 - spec/controllers/rpc_import_spec.rb

data/app/controllers/marty/diagnostic_controller.rb

@@ -1,32 +0,0 @@
-module Marty
-  class DiagnosticController < ActionController::Base
-    def op
-      begin
-        @result = Diagnostic::Reporter.run(request)
-      rescue NameError
-        render file: 'public/400', formats: [:html], status: 400, layout: false
-      else
-        respond_to do |format|
-          format.html {@result = display_parameters}
-          format.json {render json: process_result_for_api}
-        end
-      end
-    end
-
-    def process_result_for_api
-      @result.delete('data') unless request.params['data'] == 'true'
-      @result.delete('errors') if @result['errors'] && @result['errors'].empty?
-      @result
-    end
-
-    def display_parameters
-      local  = params[:scope] == 'local'
-      data   = local ? @result : @result['data']
-      errors = local ?  Diagnostic::Reporter.errors(data) : @result['errors']
-      {
-        'display' => Diagnostic::Reporter.displays(data),
-        'errors' => errors
-      }
-    end
-  end
-end

data/app/models/diagnostic/base_collection.rb

@@ -1,10 +0,0 @@
-# used to group separate diagnostics into one diagnostic
-class Diagnostic::Collection < Diagnostic::Base
-  class_attribute :diagnostics
-  self.diagnostics = []
-
-  def self.generate
-    raise 'No diagnostics assigned to collection.' if diagnostics.empty?
-    diagnostics.map{|diagnostic| diagnostic.generate}.reduce(:deep_merge)
-  end
-end

data/app/models/diagnostic/helper.rb

@@ -1,11 +0,0 @@
-class Diagnostic::Helper
-  include Delorean::Model
-
-  delorean_fn :my_ip, sig:0 do
-    Diagnostic::Node.my_ip
-  end
-
-  delorean_fn :git, sig:0 do
-    [my_ip, ENV['DELAYED_VER']]
-  end
-end

data/app/models/diagnostic/version.rb

@@ -1,17 +0,0 @@
-class Diagnostic::Version < Diagnostic::Base
-  def self.generate
-    pack do
-      begin
-        message = `cd #{Rails.root.to_s}; git describe --tags --always;`.strip
-      rescue
-        message = error("Failed accessing git")
-      end
-      {
-        'Marty'    => Marty::VERSION,
-        'Delorean' => Delorean::VERSION,
-        'Mcfly'    => Mcfly::VERSION,
-        'Git'      => message,
-      }
-    end
-  end
-end

data/spec/controllers/diagnostic_controller_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-module Marty
-  RSpec.describe DiagnosticController, type: :controller do
-    before(:each) { @routes = Marty::Engine.routes }
-    let(:json_response) { JSON.parse(response.body) }
-
-    describe 'GET #op' do
-      it 'returns http success' do
-        get :op, format: :json, op: 'version'
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'a request injects the request object into Diagnostic classes' do
-        get :op, format: :json, op: 'version'
-        expect(Diagnostic::Reporter.request).not_to eq(nil)
-      end
-
-      it 'returns the current version JSON' do
-        get :op, format: :json, op: 'version', data: 'true'
-
-        # generate version data and declare all values consistent
-        versions = Diagnostic::Version.generate.each_with_object({}){
-          |(n, v),h|
-          h[n] = v.each{|t, r| r['consistent'] = true}
-        }
-
-        expected = {
-          'data' => {
-            'Diagnostic::Version' => versions
-          }
-        }
-
-        expect(assigns('result')).to eq(expected)
-      end
-    end
-  end
-end