deploy_rubygem 0.60.0.4.ga6cf712 → 0.60.4

data/lib/deploy_rubygem/deploy_rubygem_options.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Inspec to deploy and manage Inspec
+  class DeployRubygemOptions
+    def project_name
+      'deploy_rubygem'
+    end
+
+    def git
+      'git@github.com:JimboDragonGit/deploy_rubygem.git'
+    end
+
+    def chefrepo_git
+      'git@github.com:JimboDragonGit/jimbodragon.git'
+    end
+
+    def chefrepo_path
+      '/usr/local/chef/repo/jimbodragon'
+    end
+
+    def binaries
+      %w[
+        deploy_rubygem
+        prepare_workstation
+        test_deploy_rubygem
+        deploy_jimbodragon
+      ]
+    end
+
+    def dependencies
+      %w[
+        deploy_rubygem
+        jimbo_management_site
+      ]
+    end
+
+    def path
+      File.join(ENV['HOME'], 'deploy_rubygem')
+    end
+
+    def jimbodragon_profiles
+      %w[
+        jimbodragon-accept
+        jimbodragon-applications
+        jimbodragon-deploy-context
+        jimbodragon-environment
+        jimbodragon-git
+      ]
+    end
+
+    def workstation_profiles
+      %w[
+        jimbodragon-linux-baseline
+        jimbodragon-manual-push
+        jimbodragon-push
+        jimbodragon-services
+        jimbodragon-users
+        jimbodragon-workstation
+      ]
+    end
+
+    def compliance_profiles
+      jimbodragon_profiles + workstation_profiles
+    end
+
+    def jimbo_management_site_cookbook
+      {
+        git: 'git@github.com:JimboDragonGit/jimbo_management_site.git',
+        path: File.join(ENV['HOME'], 'jimbo_management_site'),
+        kitchens: %w[base],
+        compliance_profiles: compliance_profiles,
+        execute_profiles: %w[jimbodragon-accept],
+        groups: %w[base]
+      }
+    end
+
+    def jimbo_management_site_profile
+      {
+        input: 'compliance/inputs/user.yml',
+        profile: 'jimbodragon-management-site'
+      }
+    end
+
+    def cookbooks
+      {
+        jimbo_management_site: jimbo_management_site_cookbook
+      }
+    end
+
+    def compile
+      {
+        project_name: project_name,
+        git: git,
+        chefrepo_git: chefrepo_git,
+        chefrepo_path: chefrepo_path,
+        binaries: binaries,
+        dependencies: dependencies,
+        path: path,
+        cookbooks: cookbooks
+      }
+    end
+  end
+end

data/lib/deploy_rubygem/inspec.rb

@@ -1,15 +1,27 @@
+# frozen_string_literal: true
 
+require 'deploy_rubygem/project'
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
 module DeployRubygem
+  # Using Inspec to deploy and manage Inspec
   class Inspec
-    attr_reader :inspec_name
+    attr_reader :inspec_name, :input_file
 
-    def initialize(inspec_name)
+    def initialize(inspec_name, input_file = nil)
       @inspec_name = inspec_name
+      @input_file = input_file
     end
 
     def apply
+      puts "ActuaL Dir #{Dir.pwd}"
+      puts "inspec_name = #{inspec_name}"
+      puts "input_file = #{input_file}"
       system("inspec check compliance/profiles/#{inspec_name}")
-      system("inspec exec compliance/profiles/#{inspec_name}")
+      cmd_opt = ''
+      cmd_opt = "--input-file #{input_file}" unless input_file.nil?
+      system("inspec exec compliance/profiles/#{inspec_name} #{cmd_opt}")
     end
 
     def update

data/lib/deploy_rubygem/kitchen.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'deploy_rubygem/inspec'
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Kitchen to deploy and manage Kitchen
+  class Kitchen
+    attr_reader :kitchen_name, :cookbook
+
+    def initialize(kitchen_name, cookbook)
+      @kitchen_name = kitchen_name
+      @cookbook = cookbook
+    end
+
+    def check_file
+      ::File.join("#{kitchen_name}_check.log")
+    end
+
+    def converge
+      system("kitchen converge #{kitchen_name}")
+    end
+
+    def destroy
+      system("kitchen destroy #{kitchen_name}")
+    end
+
+    def ip
+      switch_to_cookbook
+      system("kitchen exec #{kitchen_name} -c 'hostname -I'")
+    end
+
+    def verify(showing: true)
+      cookbook.switch_to_cookbook
+      if showing
+        system("kitchen verify #{kitchen_name}")
+      else
+        system("kitchen verify #{kitchen_name} > #{check_file}")
+      end
+    end
+
+    def target
+      verify(showing: false)
+      system("grep -n Target #{check_file}")
+    end
+  end
+end

data/lib/deploy_rubygem/project.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Project to deploy and manage Project
+  class Project
+    attr_reader :project_options, :cookbooks, :compliance_profile
+
+    def initialize(new_project_options)
+      @project_options = new_project_options
+      @cookbooks = project_options[:cookbooks]&.map do |cookbook_name, cookbook_options|
+        new_cookbook_option = cookbook_options.dup
+        new_cookbook_option[:project_name] = cookbook_name
+        new_cookbook_option[:chefrepo_path] = chefrepo_path
+        Cookbook.new(new_cookbook_option)
+      end
+      @compliance_profile = Inspec.new(project_options[:compliance_profile])
+    end
+
+    # Wrapping GVB to fetch project version
+    class DeployVersion
+      attr_reader :path
+
+      def initialize(git_path)
+        @path = git_path
+      end
+
+      def execute_in_folder
+        current_folder = Dir.pwd
+        Dir.chdir path
+        get_gvb = yield if block_given?
+        Dir.chdir current_folder
+        get_gvb
+      end
+
+      def method_missing(method_name)
+        execute_in_folder { GVB.send(method_name) }
+      end
+
+      def respond_to_missing?(method_name)
+        GVB.methods.include?(method_name)
+      end
+
+      def patch_bump
+        execute_in_folder { system('git version-bump patch') }
+      end
+
+      def short_version
+        "#{major_version}.#{minor_version}.#{patch_version}"
+      end
+    end
+
+    def project_name
+      project_options[__method__]
+    end
+
+    def binaries
+      project_options[__method__]
+    end
+
+    def dependencies
+      project_options[__method__]
+    end
+
+    def path
+      project_options[__method__]
+    end
+
+    def git
+      project_options[__method__]
+    end
+
+    def chefrepo_git
+      project_options[__method__]
+    end
+
+    def chefrepo_path
+      project_options[__method__]
+    end
+
+    def deploy_cookbooks
+      cookbooks.each(&:deploy)
+    end
+
+    def release_cookbooks
+      project_options[:cookbooks].each(&:release)
+    end
+
+    def change_to_directory(git_path, git_url)
+      system("git clone #{git_url}") unless Dir.exist?(chefrepo_path)
+      Dir.chdir(git_path)
+      git_path
+    end
+
+    def change_to_project_folder
+      change_to_directory(path, git)
+    end
+
+    def change_to_chefrepo
+      change_to_directory(chefrepo_path, chefrepo_git)
+    end
+
+    def test_compliance
+      change_to_chefrepo
+      compliance_profile.update
+      compliance_profile.apply
+    end
+
+    def git_commit
+      system('git add .') || exit(106)
+      system("git commit -m \"Deploying #{project_name}_$(git version-bump show)\"")
+      system("git commit -m 'Self valifated for version #{GVB.version}'") || exit(107)
+      system('git push') || exit(108)
+    end
+
+    def gvb_version
+      @gvb_version ||= DeployVersion.new(path)
+      @gvb_version
+    end
+  end
+end

data/lib/deploy_rubygem/rubygem.rb

@@ -1,61 +1,85 @@
+# frozen_string_literal: true
 
-module DeployRubygem
-  class Rubygem
-    attr_reader :project_options
-
-    def initialize(new_project_options)
-      @project_options = new_project_options
-    end
-
-    def project_name
-      project_options[__method__]
-    end
-
-    def binaries
-      project_options[__method__]
-    end
-
-    def dependencies
-      project_options[__method__]
-    end
-
-    def path
-      project_options[__method__]
-    end
+require 'deploy_rubygem/cookbook'
 
-    def deploy
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Rubygem to deploy and manage Rubygem
+  class Rubygem < Project
+    def deploy_dependencies
       dependencies.each do |git_depends|
         Dir.chdir(::File.join(ENV['HOME'], git_depends))
         system('git pull')
 
-        system("git add .")
-      
+        system('git add .')
+
         system("git commit -m \"Deploying #{project_name}_$(git version-bump show)\"")
 
         system('git push')
       end
+    end
 
-      Dir.chdir(path)
-      system('git pull')
-
-      binaries.each do |executable| 
+    def git_prepare
+      binaries.each do |executable|
         system("git add bin/#{executable}")
       end
-      
+
       system('git add deploy_rubygem.gemspec')
       system('git add .circleci/config.yml')
-      
+
       system('git add lib')
-      
+    end
+
+    def git_sync
+      Dir.chdir(path)
+      system('git pull')
+    end
+
+    def push_minor_bump
       system("git commit -m \"Deploying #{project_name}_$(git version-bump show)\"")
-      
       system('git version-bump patch') # <major|minor|patch|show>
-      
       system('gem build')
-      
       system('gem push deploy_rubygem-$(git version-bump show).gem')
-      
       system('git version-bump minor') # <major|minor|patch|show>
     end
+
+    def deploy_with_git
+      deploy_dependencies
+      git_sync
+      git_prepare
+
+      push_minor_bump
+    end
+
+    def rake_test
+      File.delete('Gemfile.lock') if File.exist?('Gemfile.lock')
+      system('bundle') || exit(100)
+      system('rake') || exit(101)
+      system('rake build') || exit(102)
+      system('rake install:local') || exit(103)
+    end
+
+    def rake_release
+      change_to_project_folder
+      git_commit
+      system('rake install') || exit(104)
+      system('rake release') || exit(105)
+    end
+
+    def release
+      change_to_project_folder
+      rake_test
+      rake_release
+    end
+
+    def deploy
+      change_to_chefrepo
+      deploy_cookbooks
+      change_to_project_folder
+
+      release
+      test_compliance
+    end
   end
 end

data/lib/deploy_rubygem/version.rb

@@ -1,6 +1,20 @@
 # frozen_string_literal: true
 
 require 'git-version-bump'
+
+require 'deploy_rubygem/rubygem'
+require 'deploy_rubygem/deploy_rubygem_options'
+
+# Set version for DeployRubygem
 module DeployRubygem
-  VERSION = GVB.version
+  def self.project_name
+    'deploy_rubygem'
+  end
+
+  def self.new_deploy_rubygem
+    @self_project = Rubygem.new(DeployRubygemOptions.new.compile) if @self_project.nil?
+    @self_project
+  end
+
+  VERSION = new_deploy_rubygem.gvb_version.short_version
 end

data/lib/deploy_rubygem.rb

@@ -1,124 +1,7 @@
+# frozen_string_literal: true
 
-require 'deploy_rubygem/rubygem'
-require 'deploy_rubygem/cookbook'
 require 'deploy_rubygem/version'
 
+# DeployRubygem - deploy a gem using rake
 module DeployRubygem
-  def self.project_name
-    'deploy_rubygem'
-  end
-
-  def self.self_project_options
-    {
-      project_name: project_name,
-      git: 'git@github.com:JimboDragonGit/deploy_rubygem.git',
-      chefrepo_git: 'git@github.com:JimboDragonGit/jimbodragon.git',
-      binaries: %w(
-        deploy_rubygem
-        prepare_workstation
-        test_deploy_rubygem
-        deploy_jimbodragon
-      ),
-      dependencies: %w(
-        deploy_rubygem
-        jimbo_management_site
-      ),
-      path: DeployRubygem.deploy_rubygem_path,
-      cookbooks: {
-        jimbo_management_site: {
-          chef_repo: DeployRubygem.chefrepo_path,
-          git: 'git@github.com:JimboDragonGit/jimbo_management_site.git',
-          kitchens: %w(base),
-          profiles: %w(
-            jimbodragon-accept
-            jimbodragon-applications
-            jimbodragon-deploy-context
-            jimbodragon-environment
-            jimbodragon-git/
-            jimbodragon-linux-baseline
-            jimbodragon-manual-push
-            jimbodragon-push
-            jimbodragon-services
-            jimbodragon-users
-            jimbodragon-workstation
-          ),
-          execute_profiles: %w(jimbodragon-accept),
-          groups: %w(base)
-        }
-      }
-    }
-  end
-
-  def self.self_deploy
-    Rubygem.new(self_project_options).deploy
-  end
-
-  def self.deploy_jimbo_management_site
-    self_project_options[:cookbooks].each do |cookbook_name, cookbook_options|
-      Cookbook.new(cookbook_name, cookbook_options).deploy
-    end
-  end
-  
-
-  def self.deploy_rubygem_path
-    File.join(ENV['HOME'], project_name)
-  end
-  
-
-  def self.jimbo_management_site_path
-    File.join(ENV['HOME'], 'jimbo_management_site')
-  end
-
-  def self.chefrepo_path
-    "/usr/local/chef/repo/jimbodragon"
-  end
-  
-
-  def self.change_to_directory(git_path, git_url)
-    if not Dir.exist?(chefrepo_path)
-      system("git clone #{git_url}")
-    end
-    Dir.chdir(git_path)
-    git_path
-  end
-
-  def self.main
-    DeployRubygem.change_to_directory(DeployRubygem.chefrepo_path, self_project_options[:chefrepo_git])
-    DeployRubygem.change_to_directory(DeployRubygem.jimbo_management_site_path, self_project_options[:cookbooks][:jimbo_management_site][:git])
-    DeployRubygem.change_to_directory(DeployRubygem.deploy_rubygem_path, self_project_options[:git])
-
-    DeployRubygem.self_deploy
-    DeployRubygem.deploy_jimbo_management_site
-  end
-
-  def self.rake_test
-    File.delete('Gemfile.lock') if File.exist?('Gemfile.lock')
-    system("bundle") || exit(100)
-    system("rake") || exit(101)
-    system("rake build") || exit(102)
-    system("rake install:local") || exit(103)
-  end
-
-  def self.rake_release
-    git_commit
-    system("rake install") || exit(104)
-    system("rake release") || exit(105)
-  end
-
-  def self.git_commit
-    system("git add .") || exit(106)
-    system("git commit -m 'Self valifated for version #{GVB.version}'") || exit(107)
-    system("git push") || exit(108)
-  end
-
-  def self.release
-    DeployRubygem.change_to_directory(DeployRubygem.deploy_rubygem_path, self_project_options[:git])
-    rake_test
-    rake_release
-  end
-
-  def self.deploy_jimbodragon
-    Dir.chdir(jimbo_management_site_path)
-    system('sudo rm -rf /tmp/jimbodragon/; chef exec inspec exec compliance/profiles/jimbodragon-chef')
-  end
 end

data/spec/generate_test_cookbook.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# RSpec.describe 'testing with cookbook' do
+#   it "create a test cookbook" do
+#     change_repo = DeployRubygem.change_to_directory(DeployRubygem.chefrepo_path, 'git@github.com:JimboDragonGit/jimbodragon.git')
+#     expect(change_repo).not_to be nil
+#     expect(change_repo).to include DeployRubygem.chefrepo_path
+#   end
+
+#   it "Change to jimbo_management_site folder" do
+#     change_repo = DeployRubygem.change_to_directory(DeployRubygem.jimbo_management_site_path, 'git@github.com:JimboDragonGit/jimbo_management_site.git')
+#     expect(change_repo).not_to be nil
+#     expect(change_repo).to include DeployRubygem.jimbo_management_site_path
+#   end
+
+#   it "Change to deploy_rubygem folder" do
+#     change_repo = DeployRubygem.change_to_directory(DeployRubygem.deploy_rubygem_path, 'git@github.com:JimboDragonGit/deploy_rubygem.git')
+#     expect(change_repo).not_to be nil
+#     expect(change_repo).to include DeployRubygem.deploy_rubygem_path
+#   end
+# end

data/spec/jimbo_management_site.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Get jimbo_management_site cookbook' do
+  it 'should not be null' do
+    expect(jimbo_management_site_cookbook).not_to be nil
+  end
+  it 'should be a Project' do
+    expect(jimbo_management_site_cookbook).to be_kind_of(DeployRubygem::Project)
+  end
+  it 'should be a Cookbook' do
+    expect(jimbo_management_site_cookbook).to be_kind_of(DeployRubygem::Cookbook)
+  end
+  %w[deploy].each do |method|
+    it "should have method #{method}" do
+      expect(jimbo_management_site_cookbook.methods.include?(method.to_sym)).to eq(true)
+    end
+  end
+end
+
+RSpec.describe 'Upload jimbo_management_site cookbook' do
+  it 'should switch to cookbook folder' do
+    switch_output = jimbo_management_site_cookbook.switch_to_cookbook
+    expect(switch_output).to be_kind_of(String)
+    expect(switch_output).to eq(jimbo_management_site_cookbook.path)
+  end
+  it 'should save progress' do
+    expect(jimbo_management_site_cookbook.save_progress).to be true
+  end
+  it 'should upload cookbook' do
+    upload_cookbook_output = jimbo_management_site_cookbook.upload_cookbook
+    expect(upload_cookbook_output).to be_kind_of(Array)
+    expect(upload_cookbook_output).to match(jimbo_management_site_cookbook.groups)
+  end
+end
+
+RSpec.describe 'Test jimbo_management_site cookbook' do
+  it 'should prepare test environment' do
+    prepare_test_environment_output = jimbo_management_site_cookbook.prepare_test_environment
+    expect(prepare_test_environment_output).to be_kind_of(Array)
+    expect(prepare_test_environment_output).to match(jimbo_management_site_cookbook.kitchens)
+  end
+  it 'should verify' do
+    verify_output = jimbo_management_site_cookbook.verify
+    expect(verify_output).to be_kind_of(Array)
+    expect(verify_output).to match(jimbo_management_site_cookbook.execute_profiles)
+  end
+  it 'should save progress again' do
+    expect(jimbo_management_site_cookbook.save_progress).to be true
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "deploy_rubygem"
+require 'deploy_rubygem'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
+  config.example_status_persistence_file_path = '.rspec_status'
 
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!
@@ -13,3 +13,13 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 end
+
+def deploy_rubygem
+  DeployRubygem.new_deploy_rubygem
+end
+
+def jimbo_management_site_cookbook
+  deploy_rubygem.cookbooks.select do |cookbook|
+    cookbook.cookbook_name.match? 'jimbo_management_site'
+  end.first
+end