sambot 0.1.206 → 0.1.207

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29631e3da738fcaeb3b7b7d829874ff89081554
-  data.tar.gz: 0b59b73c1c3c9a508e2a7f88ba92bd98a13a37ce
+  metadata.gz: 15173b6ef6750e6401a9c62293cdb2ff2bd3198c
+  data.tar.gz: 1c296d1fad951712c9dfb0b32ba6282eb15a1a09
 SHA512:
-  metadata.gz: b88385b1837f87c208d14ebc27ab2bc97e15bd8eec0937f24532ba783aa03e9f038962974a73c652ab8323c63a527c66bcc489fe42b4c7122ddd93e3781fb9b0
-  data.tar.gz: 29229d26b3dc727724b054e1d575fcacb2388b80dd30a01f4ea7569a573a7b2b4e82e0b7a4b7ff05025af210cd624cc990e1d86573631bec818f505c5f222980
+  metadata.gz: b195367df5cbd3e1cd8647e4373e0b6ed952836ab931721bd5e27ea03b6552a6303bdcc6764c2f40fd0ece75fc661456bac2186fcee3cc97fbdbff7e608813a7
+  data.tar.gz: 8dc092c24417da4bfe16584ece7e30d6501a19134c121333f51d4b0f4b177c7cb7e8ea384c9d28af8165b26ce6f534b121b6f7173c0d88fb49523925a79b053f

data/integration_tests/docker-compose.yml

@@ -2,7 +2,6 @@ version: '2'
 services:
   vault:
     image: vault
-    container_name: vault
     ports:
       - "8200:8200"
     cap_add:

data/integration_tests/vault_helper_spec.rb

@@ -8,8 +8,8 @@ Fixtures = Sambot::Testing::Fixtures
 RSpec.describe Sambot::Testing::VaultHelper do
 
   before(:each) do
-    `docker-compose down`
-    `docker-compose up -d`
+    `docker-compose -p local down`
+    `docker-compose -p local up -d`
     VaultHelper.setup
     ::Vault.configure do |config|
       config.address = 'http://127.0.0.1:8200'

data/lib/sambot.rb

@@ -23,6 +23,8 @@ require_relative 'sambot/chef/server'
 require_relative 'sambot/chef/generator'
 require_relative 'sambot/chef/roles'
 
+require_relative 'sambot/tasks/create'
+
 require_relative 'sambot/cli'
 
 module Sambot

data/lib/sambot/chef/cookbook.rb

@@ -50,6 +50,8 @@ module Sambot
           Dir.chdir(config.name) do
             create_files(config)
           end
+          #TeamCity.create_build_configuration(config)
+          #SourceControl.create_repository(config)
           UI.info('The cookbook has been successfully created.')
         end
 

data/lib/sambot/cli.rb

@@ -20,7 +20,6 @@ module Sambot
     desc 'up', 'Setup the Docker environment for testing cookbooks'
     def up
       execute do
-        require 'docker/compose'
         up_cmd
         populate_cmd
       end
@@ -29,7 +28,6 @@ module Sambot
     desc 'down', 'Destroy the Docker environment for testing cookbooks'
     def down
       execute do
-        require 'docker/compose'
         down_cmd
       end
     end
@@ -37,7 +35,6 @@ module Sambot
     desc 'test', 'Test a cookbook using the Docker environment'
     def test
       execute do
-        require 'docker/compose'
         up_cmd
         populate_cmd
         down_cmd
@@ -79,15 +76,7 @@ module Sambot
     desc 'create', 'Creates a new Chef cookbook'
     def create
       execute do
-        opts = {
-          'name' => ask(' What is the name of this cookbook?'),
-          'type' => ask(' What type of cookbook will this be?', limited_to: %w[wrapper role]),
-          'platforms' => ask(' What operating system will this cookbook run on?', limited_to: %w[windows centos both]),
-          'description' => ask(' What does this cookbook do?')
-        }
-        opts['identifier'] = ask(' What will be the unique machiner identifier for this role cookbook i.e. TCA (TeamCity Agent) or RMQ (RabbitMQ role)?') if opts['type'] == 'role'
-        opts['platforms'] = opts['platforms'] == 'both' ? %w[centos windows] : [opts['platforms']]
-        Chef::Cookbook.create(Config.new(opts))
+        Sambot::Tasks::Create.new.run
       end
     end
 
@@ -109,13 +98,11 @@ module Sambot
       end
 
       def down_cmd
-        compose = Docker::Compose.new
-        compose.down
+        `docker-compose -p local down`
       end
 
       def up_cmd
-        compose = Docker::Compose.new
-        compose.up(detached: true)
+        `docker-compose -p local up -d`
       end
 
     end

data/lib/sambot/config.rb

@@ -41,6 +41,10 @@ module Sambot
       Config.new(config)
     end
 
+    def is_role_cookbook?
+      name.start_with?('as-role-') || name.start_with?('as-app-role-')
+    end
+
     def available_platforms
       platforms = @opts[:platforms] if @opts.key?(:platforms)
       platforms = @opts['platforms'] if @opts.key?('platforms')
@@ -48,11 +52,11 @@ module Sambot
     end
 
     def gems
-      @opts['gems'] || @opts[:gems] || []
+      @opts['gems'] || []
     end
 
     def dependencies
-      items = @opts['dependencies'] || @opts[:dependencies]
+      items = @opts['dependencies']
       items ? items.map { |x| transform_hashes(x) } : []
     end
 

data/lib/sambot/docs/populate.txt

@@ -1,7 +1,3 @@
 #################################################################################
-# <SAMBOT> VERSION COMMAND                                                      #
+# <SAMBOT> POPULATE COMMAND                                                     #
 #################################################################################
-
-This command will output the version of the cookbook in the current directory.
-
-It is mostly used for CI in order to give TeamCity builds their correct version number.

data/lib/sambot/source_control.rb

@@ -12,6 +12,20 @@ module Sambot
       ET_GITHUB_API = 'https://github.exacttarget.com/api/v3'
       ET_GITHUB = 'https://github.exacttarget.com'
 
+      def create_repository(name, organization = nil)
+        # Need to check whether repo already exists first and do nothing if yes
+        api.repos.create "name": name, org: organization,
+            "private": false,
+            "has_issues": true,
+            "has_wiki": false,
+            "has_downloads": true
+      end
+
+      def delete_repository(user, repo)
+        # Need to check whether repo exists first
+        api.repos.delete user, repo
+      end
+
       def checkout(organization)
         repositories = list_organization_repositories(organization)
         repositories.each do |repository|
@@ -49,6 +63,7 @@ module Sambot
       end
 
       def api
+        check_configuration
         @github ||= Github.new do |c|
           c.basic_auth = "#{ENV['GITHUB_USERNAME']}:#{ENV['GITHUB_PERSONAL_TOKEN']}"
           c.endpoint = ET_GITHUB_API
@@ -56,6 +71,17 @@ module Sambot
         end
       end
 
+      def check_configuration
+        unless ENV['GITHUB_USERNAME']
+          UI.error("Please ensure the GITHUB_USERNAME environment variable is set before running Github tasks.")
+          exit
+        end
+        unless ENV['GITHUB_PERSONAL_TOKEN']
+          UI.error("Please ensure the GITHUB_PERSONAL_TOKEN environment variable is set before running Github tasks. A personal token can be obtained from your Github account settings.")
+          exit
+        end
+      end
+
     end
   end
 end

data/lib/sambot/tasks/create.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative '../base_command'
+
+module Sambot
+  module Tasks
+    class Create < BaseCommand
+
+      NAME_REQUEST = ' What is the name of this cookbook?'
+
+      PLATFORM_REQUEST = ' What operating system will this cookbook run on?'
+
+      DESCRIPTION_REQUEST = ' What does this cookbook do?'
+
+      PLATFORM_OPTIONS = %w[windows centos both]
+
+      IDENTIFIER_REQUEST = ' What will be the unique machiner identifier for this role cookbook i.e. TCA (TeamCity Agent) or RMQ (RabbitMQ role)?'
+
+      no_commands do
+
+        def run
+          opts = {
+            'name' => ask(NAME_REQUEST),
+            'platforms' => ask(PLATFORM_REQUEST, limited_to: PLATFORM_OPTIONS),
+            'description' => ask(DESCRIPTION_REQUEST)
+          }
+          check_cookbook_name(opts['name'])
+          opts['identifier'] = ask(IDENTIFIER_REQUEST) if is_valid_role_name?(opts['name'])
+          opts['platforms'] = normalize_platforms(opts['platforms'])
+          Chef::Cookbook.create(Config.new(opts))
+        end
+
+        def normalize_platforms(platforms)
+          platforms == 'both' ? PLATFORM_OPTIONS - ['both']: platforms
+        end
+
+        def check_cookbook_name(name)
+          unless is_valid_name?(name)
+            UI.error('The cookbook name you have provided is invalid')
+            exit 1
+          end
+        end
+
+        def is_valid_role_name?(name)
+          name.start_with?('as-role-') || name.start_with?('as-app-role-')
+        end
+
+        def is_valid_name?(name)
+          is_valid_role_name?(name)|| name.start_with?('as-')
+        end
+
+      end
+    end
+  end
+end

data/lib/sambot/team_city.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'pry'
+require 'github_api'
+require 'git'
+
+module Sambot
+  class TeamCity
+
+    class << self
+
+
+    end
+
+  end
+end

data/lib/sambot/templates/docker-compose.yml

@@ -2,9 +2,14 @@ version: '2'
 services:
   vault:
     image: vault
-    container_name: vault
     ports:
       - "8200:8200"
     cap_add:
       - IPC_LOCK
     entrypoint: vault server -dev -log-level=debug -dev-listen-address=0.0.0.0:8200 -dev-root-token-id=root
+  consul:
+    image: library/consul:0.8.5
+    ports:
+      - "8500:8500"
+    environment:
+      CONSUL_ADDR: "http://0.0.0.0:8500"

data/lib/sambot/templates/spec_helper.rb

@@ -2,3 +2,5 @@
 
 require 'chefspec'
 require 'chefspec/berkshelf'
+
+at_exit { ChefSpec::Coverage.report! }

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.206'
+  VERSION = '0.1.207'
 end

data/sambot.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'awesome_print'
   spec.add_development_dependency  'pry'
   spec.add_development_dependency  'fuubar'
-  spec.add_development_dependency 'docker-compose'
   spec.add_development_dependency 'rubocop', '~> 0.49'
   spec.add_development_dependency 'gem-release', '~> 1.0'
   spec.add_development_dependency 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.206
+  version: 0.1.207
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -274,20 +274,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: docker-compose
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -415,6 +401,8 @@ files:
 - lib/sambot/fs.rb
 - lib/sambot/runtime.rb
 - lib/sambot/source_control.rb
+- lib/sambot/tasks/create.rb
+- lib/sambot/team_city.rb
 - lib/sambot/template.rb
 - lib/sambot/templates/.config.yml.erb
 - lib/sambot/templates/.env