sambot 0.1.93 → 0.1.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7c4cb707cbcc33af0a549c901ac2f1c05eae6b
-  data.tar.gz: 19d332a38598221d55b6e5cfc7e69b153f039a77
+  metadata.gz: a6e11c44dab3910bbc5bb69d5cc9b2e54f9d5eb8
+  data.tar.gz: 33bb51b191685ad6bcac94fe16c84ffaa4ba03b8
 SHA512:
-  metadata.gz: 380918626e2c38709652e92e32eadf833f6f142abfbfaf5acaf9c0ba0e15ed74a07fadd2ccf5e59297b677b891699fea7bba470a1e507b11feafbaf9621b9b6f
-  data.tar.gz: '0338c1810cb49f74bafb1cca30ac8f4cbb15fdc63126f267fe83de6b2003b6a785e1c61ead8c2dd45f4875fd98703bbc48f3ecbe3633b67b68df3edc91dcc2a0'
+  metadata.gz: 73ce805f93debb791cb76ed4e9c7dae7f7fa4071695bc4b75f3a00ee6d97752c2a240c3482a954551fdb7300b19aa36774a20b8ecacd812e3c94a979f8a2f8be
+  data.tar.gz: 69a7beda710d2e1fc7009a3c983fc82c26b59b16c5b31506e017672c8f70b7e2937a26c22d49a011480023009886fbf1b39989d4e14b2e9786dba741f1db1b99

data/lib/sambot/application_error.rb

@@ -0,0 +1,4 @@
+module Sambot
+  class ApplicationError < RuntimeError
+  end
+end

data/lib/sambot/{domain → chef}/cookbook.rb

@@ -2,11 +2,11 @@ require 'yaml'
 require 'git'
 
 module Sambot
-  module Domain
+  module Chef
     class Cookbook
 
         def self.build(essential_files, generated_files)
-          config = Common::Config.new.read
+          config = Config.new.read
           validate_cookbook_structure(config['platforms'], essential_files, generated_files)
           setup_test_kitchen(config)
           build_metadata(config)
@@ -58,12 +58,12 @@ module Sambot
             'description' => description,
           }.to_yaml
           File.write('.config.yml', contents)
-          Domain::UI.debug("./.config.yml has been added to the cookbook.")
+          UI.debug("./.config.yml has been added to the cookbook.")
         end
 
         def self.copy_git_hooks
           working_path = '.git/hooks/pre-push'
-          template_path = Common::TemplateProvider.get_path('pre-push')
+          template_path = FileManagement::TemplateProvider.get_path('pre-push')
           File.delete(working_path) if File.exist?(working_path)
           FileUtils.cp(template_path, working_path)
           UI.debug("The pre-push Git hook has been added to the cookbook.")
@@ -77,11 +77,11 @@ module Sambot
         end
 
         def self.validate_cookbook_structure(platform, essential_files, generated_files)
-          essential_files.each { |path| Common::FileChecker.new.verify(path) }
+          essential_files.each { |path| FileManagement::FileChecker.new.verify(path) }
           if platform.include?('windows')
-            Common::FileChecker.new.update(['winrm_config'])
+            FileManagement::FileChecker.new.update(['winrm_config'])
           end
-          Common::FileChecker.new.update(generated_files)
+          FileManagement::FileChecker.new.update(generated_files)
         end
 
         def self.setup_test_kitchen(config)

data/lib/sambot/{domain/chef → chef}/kitchen.rb

@@ -1,5 +1,4 @@
 module Sambot
-  module Domain
     module Chef
       class Kitchen
 
@@ -26,7 +25,7 @@ module Sambot
         private
 
         def self.read_template(template, cookbook_name, platforms)
-          filename = File.join(Common::TemplateProvider.get_path("#{template}.erb"))
+          filename = File.join(FileManagement::TemplateProvider.get_path("#{template}.erb"))
           contents = File.read(filename).gsub(/@@cookbook_name@@/, cookbook_name)
           eruby = Erubis::Eruby.new(contents)
           yaml = eruby.evaluate({platforms: platforms}).gsub(/\_@/, "<%=").gsub(/@\_/, "%>")
@@ -34,6 +33,5 @@ module Sambot
         end
 
       end
-    end
   end
 end

data/lib/sambot/{domain/chef → chef}/metadata.rb

@@ -1,10 +1,11 @@
 require 'erubis'
 
 module Sambot
-  module Domain
     module Chef
       class Metadata
 
+        TemplateProvider = FileManagement::TemplateProvider
+
         def self.generate(name, platforms, version, description, dependencies = nil, gems = nil)
           context = {
             'cookbook_name' => name,
@@ -20,13 +21,12 @@ module Sambot
         private
 
         def self.generate_metadata(context)
-          filename = File.join(File.dirname(__FILE__), '../../templates', 'metadata.rb.erb')
+          filename = TemplateProvider.get_path('metadata.rb.erb')
           input = File.read(filename)
           eruby = Erubis::Eruby.new(input)
           eruby.evaluate(context)
         end
 
       end
-    end
   end
 end

data/lib/sambot/cli.rb

@@ -1,25 +1,23 @@
 require 'thor'
-require_relative 'domain/common/application_error'
-require_relative 'domain/common/file_checker'
-require_relative 'domain/common/config'
-require_relative 'domain/common/runtime'
-require_relative 'domain/common/template_provider'
-require_relative 'domain/gcp/images'
-require_relative 'domain/chef/kitchen'
-require_relative 'domain/chef/metadata'
-require_relative 'domain/ssh/config_file'
-require_relative 'domain/ssh/config_section'
-require_relative 'domain/ssh/parser'
-require_relative 'domain/bastion_host'
-require_relative 'domain/dns'
-require_relative 'domain/session'
-require_relative 'domain/vault'
-require_relative 'domain/ui'
-require_relative 'domain/cookbook'
-require_relative 'domain/packer'
-require_relative 'domain/workstation'
+require_relative 'application_error'
+require_relative 'config'
+require_relative 'ui'
+require_relative 'runtime'
+require_relative 'file_management/template_provider'
+require_relative 'file_management/file_checker'
+require_relative 'chef/kitchen'
+require_relative 'chef/metadata'
+require_relative 'chef/cookbook'
+require_relative 'ssh/config_file'
+require_relative 'ssh/config_section'
+require_relative 'ssh/parser'
+require_relative 'developer_workflow/bastion_host'
+require_relative 'developer_workflow/dns'
+require_relative 'developer_workflow/session'
+require_relative 'developer_workflow/vault'
+require_relative 'developer_workflow/workstation'
+require_relative 'image_pipeline/packer'
 require_relative 'commands/cookbook'
-require_relative 'commands/images'
 require_relative 'commands/session'
 require_relative 'commands/packer'
 require_relative 'commands/workstation'
@@ -33,9 +31,6 @@ module Sambot
     desc 'session', 'Manage sessions'
     subcommand 'session', Sambot::Commands::Session
 
-    desc 'images', 'Manage machine images in GCP'
-    subcommand 'images', Sambot::Commands::Images
-
     desc 'packer', 'Manage Hashicorp Packer'
     subcommand 'packer', Sambot::Commands::Packer
 

data/lib/sambot/commands/cookbook.rb

@@ -6,9 +6,6 @@ module Sambot
 
     class Cookbook < Thor
 
-      Runtime = Sambot::Domain::Common::Runtime
-      ApplicationError = Sambot::Domain::Common::ApplicationError
-
       GUIDE =
       {
         clean: {
@@ -46,7 +43,7 @@ module Sambot
       long_desc GUIDE[:clean][:LONG_DESC]
       def clean
         Runtime.ensure_latest
-        Domain::Cookbook.clean(GENERATED_FILES - ['.gitignore'])
+        Chef::Cookbook.clean(GENERATED_FILES - ['.gitignore'])
       rescue ApplicationError => e
         error(e.message)
       end
@@ -55,7 +52,7 @@ module Sambot
       long_desc GUIDE[:clean][:LONG_DESC]
       def build
         Runtime.ensure_latest
-        Domain::Cookbook.build(ESSENTIAL_FILES, GENERATED_FILES)
+        Chef::Cookbook.build(ESSENTIAL_FILES, GENERATED_FILES)
       rescue ApplicationError => e
         error(e.message)
       end
@@ -69,7 +66,7 @@ module Sambot
         platforms = ask(' What operating system will this cookbook run on?', :limited_to => ['windows', 'centos', 'both'])
         type = ask(' What type of cookbook will this be?', :limited_to => ['wrapper', 'role'])
         platforms = platforms == 'both' ? ['centos', 'windows'] : [platforms]
-        Domain::Cookbook.generate(name, platforms, type, description, ESSENTIAL_FILES, GENERATED_FILES)
+        Chef::Cookbook.generate(name, platforms, type, description, ESSENTIAL_FILES, GENERATED_FILES)
       rescue ApplicationError => e
         error(e.message)
       end
@@ -78,7 +75,7 @@ module Sambot
       long_desc GUIDE[:version][:LONG_DESC]
       def version()
         Runtime.ensure_latest
-        result = Domain::Common::Config.read
+        result = Config.read
         puts "##teamcity[buildNumber '#{result['version'].to_s}']"
       rescue ApplicationError => e
         error(e.message)

data/lib/sambot/commands/packer.rb

@@ -3,17 +3,13 @@ module Sambot
 
     class Packer < Thor
 
-      ApplicationError = Sambot::Domain::Common::ApplicationError
-      Runtime = Sambot::Domain::Common::Runtime
-      Config = Sambot::Domain::Common::Config
-
       namespace 'packer'
 
       desc "prepare", "Sets up a Packer configuration"
       def prepare
         Runtime.ensure_latest
         config = Config.new.read
-        Domain::Packer.prepare(config)
+        ImagePipeline::Packer.prepare(config)
       rescue ApplicationError => e
         error(e.message)
       end

data/lib/sambot/commands/report.rb

@@ -0,0 +1,17 @@
+module Sambot
+  module Commands
+
+    class Report < Thor
+
+      namespace 'report'
+
+      desc "consistency", "Checks the Advertising Studio build pipeline is consistent"
+      def consistency
+        Runtime.ensure_latest
+      rescue ApplicationError => e
+        error(e.message)
+      end
+
+    end
+  end
+end

data/lib/sambot/commands/session.rb

@@ -3,9 +3,6 @@ module Sambot
 
     class Session < Thor
 
-      ApplicationError = Sambot::Domain::Common::ApplicationError
-      Runtime = Sambot::Domain::Common::Runtime
-
       namespace 'session'
 
       desc "start", "Start a new DEV/QE session"
@@ -14,7 +11,7 @@ module Sambot
         username = ask(' What is your DEV/QE username i.e. jsmith? ')
         password = ask(' What is your DEV/QE password? ', :echo => false)
         say('')
-        Domain::Session.start(username, password)
+        DeveloperWorkflow::Session.start(username, password)
       rescue ApplicationError => e
         error(e.message)
       end
@@ -22,7 +19,7 @@ module Sambot
       desc "stop", "Stop the DEV/QE session"
       def stop
         Runtime.ensure_latest
-        Domain::Session.stop()
+        DeveloperWorkflow::Session.stop()
       rescue ApplicationError => e
         error(e.message)
       end

data/lib/sambot/commands/workstation.rb

@@ -3,15 +3,13 @@ module Sambot
 
     class Workstation < Thor
 
-      Runtime = Sambot::Domain::Common::Runtime
-
       namespace 'workstation'
 
       desc "configure", "Sets up an engineering workstation"
       def configure
         Runtime.ensure_latest
         username = ask(" What is your DEV/QE Active Directory username i.e. john.smith? ")
-        Domain::Workstation.configure(username)
+        DeveloperWorkflow::Workstation.configure(username)
       rescue ApplicationError => e
         error(e.message)
       end

data/lib/sambot/{domain/common/config.rb → config.rb}

@@ -1,8 +1,6 @@
 require 'yaml'
 
 module Sambot
-  module Domain
-    module Common
       class Config
 
         CONFIGURATION_FILENAME = '.config.yml'.freeze
@@ -27,6 +25,4 @@ module Sambot
         end
 
       end
-    end
-  end
 end

data/lib/sambot/{domain → developer_workflow}/bastion_host.rb

@@ -2,11 +2,10 @@ require 'awesome_print'
 require 'process_exists'
 
 module Sambot
-  module Domain
+  module DeveloperWorkflow
     class BastionHost
 
-      ApplicationError = Sambot::Domain::Common::ApplicationError
-      Parser = Sambot::Domain::Ssh::Parser
+      Parser = Sambot::Ssh::Parser
 
       def self.connect(username, password)
         disconnect

data/lib/sambot/developer_workflow/dns.rb

@@ -0,0 +1,23 @@
+require 'hosts'
+
+module Sambot
+  module DeveloperWorkflow
+    class DNS
+
+      HOST_ENTRIES = {
+        'teamcity.brighter.io' => '127.0.0.1',
+        'chef.brighter.io' => '127.0.0.1',
+        'monitoring.brighter.io' => '127.0.0.1',
+        'jenkins.brighter.io' => '127.0.0.1',
+        'splunk.brighter.io' => '127.0.0.1',
+        'rundeck.brighter.io' => '127.0.0.1',
+        'grafana.brighter.io' => '127.0.0.1',
+        'prometheus.brighter.io' => '127.0.0.1'
+      }
+
+      def self.update_hosts()
+      end
+
+    end
+  end
+end

data/lib/sambot/{domain → developer_workflow}/session.rb

@@ -1,5 +1,5 @@
 module Sambot
-  module Domain
+  module DeveloperWorkflow
     class Session
 
       def self.start(username, password)

data/lib/sambot/{domain → developer_workflow}/vault.rb

@@ -1,7 +1,7 @@
 require 'vault'
 
 module Sambot
-  module Domain
+  module DeveloperWorkflow
     class Vault
 
       ENVIRONMENT_VARIABLES = {

data/lib/sambot/{domain → developer_workflow}/workstation.rb

@@ -1,5 +1,5 @@
 module Sambot
-  module Domain
+  module DeveloperWorkflow
     class Workstation
 
       def self.configure(username)
@@ -13,7 +13,7 @@ module Sambot
       end
 
       def self.update_ssh_configuration(username)
-        config = Domain::Ssh::Parser.new.update('DEV\\' + username)
+        config = Ssh::Parser.new.update('DEV\\' + username)
         config.save
       end
 

data/lib/sambot/{domain/common → file_management}/file_checker.rb

@@ -1,6 +1,5 @@
 module Sambot
-  module Domain
-    module Common
+  module FileManagement
       class FileChecker
 
         def verify(path)
@@ -37,7 +36,6 @@ module Sambot
           UI.debug("#{working_path} has been added to the cookbook.")
         end
 
-      end
     end
   end
 end

data/lib/sambot/{domain/common → file_management}/template_provider.rb

@@ -1,13 +1,11 @@
 module Sambot
-  module Domain
-    module Common
+    module FileManagement
       class TemplateProvider
 
         def self.get_path(filename)
-          File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'templates', filename))
+          File.expand_path(File.join(File.dirname(__FILE__), '..', 'templates', filename))
         end
 
       end
-    end
   end
 end

data/lib/sambot/{domain → image_pipeline}/packer.rb

@@ -1,11 +1,10 @@
 require 'yaml'
 
 module Sambot
-  module Domain
+  module ImagePipeline
       class Packer
 
-        ApplicationError = Common::ApplicationError
-        TemplateProvider = Common::TemplateProvider
+        TemplateProvider = FileManagement::TemplateProvider
 
         def self.prepare(config)
           cookbook_name = config['name']

data/lib/sambot/{domain/common/runtime.rb → runtime.rb}

@@ -1,8 +1,6 @@
 require 'gems'
 
 module Sambot
-  module Domain
-    module Common
       module Runtime
 
         def self.is_obsolete
@@ -19,7 +17,5 @@ module Sambot
           end
         end
 
-      end
-    end
   end
 end

data/lib/sambot/{domain/ssh → ssh}/config_file.rb

@@ -1,5 +1,4 @@
 module Sambot
-  module Domain
     module Ssh
       class ConfigFile
 
@@ -77,5 +76,4 @@ module Sambot
       end
 
     end
-  end
 end

data/lib/sambot/{domain/ssh → ssh}/config_section.rb

@@ -1,5 +1,4 @@
 module Sambot
-  module Domain
     module Ssh
       class ConfigSection
 
@@ -79,6 +78,5 @@ module Sambot
         end
       end
 
-    end
   end
 end

data/lib/sambot/{domain/ssh → ssh}/parser.rb

@@ -2,7 +2,6 @@ require_relative 'config_file'
 require_relative 'config_section'
 
 module Sambot
-  module Domain
     module Ssh
       class Parser
 
@@ -43,7 +42,6 @@ module Sambot
           config
         end
 
-      end
     end
   end
 end

data/lib/sambot/templates/.gitignore

@@ -15,6 +15,7 @@ Berksfile.lock
 .*.sw[a-z]
 *.un~
 # Bundler
+packer.json
 Gemfile.lock
 bin/*
 .bundle/*

data/lib/sambot/{domain/ui.rb → ui.rb}

@@ -1,5 +1,4 @@
 module Sambot
-  module Domain
       module UI
 
         def self.debug(msg)
@@ -16,4 +15,3 @@ module Sambot
 
       end
   end
-end

data/lib/sambot/version.rb

@@ -1,3 +1,3 @@
 module Sambot
-  VERSION = '0.1.93'.freeze
+  VERSION = '0.1.94'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.93
+  version: 0.1.94
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -286,31 +286,30 @@ files:
 - bin/sambot
 - bin/setup
 - lib/sambot.rb
+- lib/sambot/application_error.rb
+- lib/sambot/chef/cookbook.rb
+- lib/sambot/chef/kitchen.rb
+- lib/sambot/chef/metadata.rb
 - lib/sambot/cli.rb
 - lib/sambot/commands/cookbook.rb
-- lib/sambot/commands/images.rb
 - lib/sambot/commands/packer.rb
+- lib/sambot/commands/report.rb
 - lib/sambot/commands/session.rb
 - lib/sambot/commands/workstation.rb
-- lib/sambot/domain/bastion_host.rb
-- lib/sambot/domain/chef/kitchen.rb
-- lib/sambot/domain/chef/metadata.rb
-- lib/sambot/domain/common/application_error.rb
-- lib/sambot/domain/common/config.rb
-- lib/sambot/domain/common/file_checker.rb
-- lib/sambot/domain/common/runtime.rb
-- lib/sambot/domain/common/template_provider.rb
-- lib/sambot/domain/cookbook.rb
-- lib/sambot/domain/dns.rb
-- lib/sambot/domain/gcp/images.rb
-- lib/sambot/domain/packer.rb
-- lib/sambot/domain/session.rb
-- lib/sambot/domain/ssh/config_file.rb
-- lib/sambot/domain/ssh/config_section.rb
-- lib/sambot/domain/ssh/parser.rb
-- lib/sambot/domain/ui.rb
-- lib/sambot/domain/vault.rb
-- lib/sambot/domain/workstation.rb
+- lib/sambot/config.rb
+- lib/sambot/developer_workflow/bastion_host.rb
+- lib/sambot/developer_workflow/dns.rb
+- lib/sambot/developer_workflow/session.rb
+- lib/sambot/developer_workflow/vault.rb
+- lib/sambot/developer_workflow/workstation.rb
+- lib/sambot/file_management/file_checker.rb
+- lib/sambot/file_management/template_provider.rb
+- lib/sambot/image_pipeline/packer.rb
+- lib/sambot/reports/consistency_report.rb
+- lib/sambot/runtime.rb
+- lib/sambot/ssh/config_file.rb
+- lib/sambot/ssh/config_section.rb
+- lib/sambot/ssh/parser.rb
 - lib/sambot/templates/.gitignore
 - lib/sambot/templates/.kitchen.gcp.yml.erb
 - lib/sambot/templates/.kitchen.rackspace.yml.erb
@@ -325,6 +324,7 @@ files:
 - lib/sambot/templates/startup-script.ps1
 - lib/sambot/templates/teamcity.sh.erb
 - lib/sambot/templates/winrm_config
+- lib/sambot/ui.rb
 - lib/sambot/version.rb
 - sambot.gemspec
 homepage: http://github.com/okouam/sambot

data/lib/sambot/commands/images.rb

@@ -1,21 +0,0 @@
-module Sambot
-  module Commands
-
-    class Images < Thor
-
-      ApplicationError = Sambot::Domain::Common::ApplicationError
-      Runtime = Sambot::Domain::Common::Runtime
-      Config = Sambot::Domain::Common::Config
-
-      namespace 'images'
-
-      desc "cleanup", "Removes obsolete images"
-      def cleanup
-        Runtime.ensure_latest
-      rescue ApplicationError => e
-        error(e.message)
-      end
-
-    end
-  end
-end

data/lib/sambot/domain/common/application_error.rb

@@ -1,9 +0,0 @@
-module Sambot
-  module Domain
-    module Common
-      class ApplicationError < RuntimeError
-
-      end
-    end
-  end
-end

data/lib/sambot/domain/dns.rb

@@ -1,24 +0,0 @@
-require 'hosts'
-
-module Sambot
-  module Domain
-
-    HOST_ENTRIES = {
-      'teamcity.brighter.io' => '127.0.0.1',
-      'chef.brighter.io' => '127.0.0.1',
-      'monitoring.brighter.io' => '127.0.0.1',
-      'jenkins.brighter.io' => '127.0.0.1',
-      'splunk.brighter.io' => '127.0.0.1',
-      'rundeck.brighter.io' => '127.0.0.1',
-      'grafana.brighter.io' => '127.0.0.1',
-      'prometheus.brighter.io' => '127.0.0.1'
-    }
-
-    class DNS
-
-      def self.update_hosts()
-      end
-
-    end
-  end
-end

data/lib/sambot/domain/gcp/images.rb

@@ -1,10 +0,0 @@
-
-module Sambot
-  module Domain
-    module GCP
-      class Images
-
-      end
-    end
-  end
-end