sambot 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba731bab2513c08744cb5d8486759a60d6ae1683
-  data.tar.gz: 9eeb26209320e7ba4eb913ccf15a77ef0a40e080
+  metadata.gz: 4c70a73f177268cdb467c2199937845ca0260738
+  data.tar.gz: a279ca714365f1b6c7537612914b6bd3548bdab2
 SHA512:
-  metadata.gz: 6e29ede2e9909138c15ed2e5f88105dd8474494a06575b9f92cc980165d6689322589b6c8183adeb7728e7e4272cf96329b1942fcbe1b9e4b1f1fa2e9f153fea
-  data.tar.gz: 03245d418abcbabbd024ef675e5991e577911c1c74669b2717087b0654321f83dc127004f83726b3daed14cd0672f415d0821ee77c8cf189c8159b61b1cf8b4b
+  metadata.gz: 00f754648cef2655993c2744b689153aa84e77e387e3910822451c82c711ff1be64d46007d6356ab520451a4c787b96ade84798dcd65fcea2dc592b5c14cfced
+  data.tar.gz: e0ba908cbba185fca5f3d6bc186a7581f7ca9f56ac3e1e8269f36fff8ee37a56f15ac902d663f6661bafd8a4e6d49854f3c442d2a83254d962f1ff36c78d4d22

data/.ruby-version

@@ -1 +1 @@
-2.2.6
+2.4.0

data/lib/sambot/commands/cookbook.rb

@@ -35,7 +35,7 @@ module Sambot
       LONGDESC
       def build
         ensure_latest
-        modified_files = Sambot::Domain::Cookbooks::AssistantChef.new.build_cookbook(ESSENTIAL_FILES, GENERATED_FILES)
+        modified_files = Domain::Cookbooks::AssistantChef.new.build_cookbook(ESSENTIAL_FILES, GENERATED_FILES)
         modified_files.each {|file| debug("./#{file} has been added to the cookbook.")}
         info('The cookbook has been successfully built.')
       rescue Domain::Common::ApplicationException => e
@@ -47,15 +47,13 @@ module Sambot
         `sambot cookbook generate` will create a new cookbook. This can be either a
         wrapper cookbook or an instance role cookbook.
       LONGDESC
-      option :name
-      option :platform, :desc => 'Can be either "windows" or "linux"'
-      option :type, :desc => 'Can be either "wrapper" or "role"'
       def generate()
         ensure_latest
         name = ask(' What is the name of this cookbook?')
+        description = ask(' What does this cookbook do?')
         platform = ask(' What operating system will this cookbook run on?', :limited_to => ['windows', 'linux'])
         type = ask(' What type of cookbook will this be?', :limited_to => ['wrapper', 'role'])
-        Sambot::Domain::Cookbooks::AssistantChef.new.generate_cookbook(name, options[:platform], options[:type], ESSENTIAL_FILES, GENERATED_FILES)
+        Sambot::Domain::Cookbooks::AssistantChef.new.generate_cookbook(name, platform, type, description, ESSENTIAL_FILES, GENERATED_FILES)
         info('The cookbook has been successfully generated.')
       rescue Domain::Common::ApplicationException => e
         error(e.message)

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

@@ -2,7 +2,7 @@ module Sambot
   module Domain
     module Common
       module UI
-
+        
         def debug(msg)
           say("debug: #{msg}", :yellow)
         end

data/lib/sambot/domain/cookbooks/assistant_chef.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'git'
 
 module Sambot
   module Domain
@@ -27,24 +28,34 @@ module Sambot
         end
 
         def generate_cookbook(name, platform, type, description, essential_files, generated_files)
-          FileUtils.mkdir(name)
-          FileUtils.mkdir(File.join(name, 'test'))
-          FileUtils.mkdir(File.join(name, 'spec'))
-          FileUtils.mkdir(File.join(name, 'recipes'))
+          Git.init(name)
           Dir.chdir(name) do
-            write_config(description, platform, type)
+            FileUtils.mkdir('test')
+            FileUtils.mkdir('spec')
+            FileUtils.mkdir('recipes')
+            FileUtils.touch('README.md')
+            write_config(name, description, platform, type)
             build_cookbook(essential_files, generated_files)
           end
         end
 
         private
 
-        def write_config(description, platform, type)
+        def write_config(name, description, platform, type)
           contents = {
-            :version => '0.0.1',
-            :platform => platform,
-            :suites => nil,
-            :description => nil
+            'name' => name,
+            'version' => '0.0.1',
+            'platform' => platform,
+            'suites' => [{
+              'name' => 'default',
+              'run_list' => [
+                "recipe[#{name}]"
+              ],
+              'verifier' => {
+                'inspec_tests' => ['./test']
+              }
+            }],
+            'description' => description,
           }.to_yaml
           File.write('.config.yml', contents)
         end
@@ -81,7 +92,7 @@ module Sambot
         end
 
         def build_metadata(config)
-          result = Metadata.new.generate(config['name'], config['platform'], config['version'], config['description'])
+          result = Metadata.new.generate(config['name'], config['platform'], config['version'], config['description'], config['dependencies'])
           File.write('metadata.rb', result)
           @modified_files << 'metadata.rb'
         end

data/lib/sambot/domain/cookbooks/metadata.rb

@@ -5,12 +5,13 @@ module Sambot
     module Cookbooks
       class Metadata
 
-        def generate(name, platform, version, description)
+        def generate(name, platform, version, description, dependencies = nil)
           context = {
             'cookbook_name' => name,
-            'cookbook_platfrom' => platform,
+            'cookbook_platform' => platform,
             'cookbook_version' => version,
-            'cookbook_description' => description
+            'cookbook_description' => description,
+            'cookbook_dependencies' => dependencies
           }
           generate_metadata(context)
         end

data/lib/sambot/templates/metadata.rb.erb

@@ -8,3 +8,9 @@ version          '<%= @cookbook_version %>'
 chef_version     '>=12'
 issues_url       'https://github.exacttarget.com/ads-cookbooks/<%= @cookbook_name %>/issues'
 source_url       'https://github.exacttarget.com/ads-cookbooks/<%= @cookbook_name %>'
+supports         '<%= @cookbook_platform %>'
+<% if @cookbook_dependencies %>
+<% @cookbook_dependencies.each do |dependency| %>
+depends          '<%= dependency %>'
+<% end %>
+<% end %>

data/lib/sambot/version.rb

@@ -1,3 +1,3 @@
 module Sambot
-  VERSION = '0.1.41'.freeze
+  VERSION = '0.1.42'.freeze
 end

data/sambot.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = 'sambot'
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'git'
+  spec.add_dependency 'chef', '~> 12.18'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'erubis', '~> 2.7', '>= 2.7.0'
   spec.add_dependency 'gems', '~> 1.0', '>= 1.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Olivier Kouame
@@ -10,6 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.18'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Tooling for a DevOps workflow