release_manager 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29e40c47ad25725e971c4fd352be640e3c099aa1
-  data.tar.gz: 262a70fdf287925fca29d271163b5b13a0681225
+  metadata.gz: 47cc71432241b0b10115b5730f655155d924a5b7
+  data.tar.gz: 70d78fd3692ac03350d146b3bbf7d11b366d64d9
 SHA512:
-  metadata.gz: 8abb760003a84f0be08fcc20cd7705b238f033aa9c5a0eece9d73c60b5b1514e0ad5ec3b96e7439414cd5cf07faef492a6fa82ec6818b7a8d9f2e9a29880382e
-  data.tar.gz: f44e93faaa946b2732adb4654db2a37f85539d6a395d697961fe52a55926ea83ab54d86c3043d45e2b643da6f240ae25df330cd84cca4615ea3468b6045b53da
+  metadata.gz: bbe4f0be2de2b5c224756271320f97a78c79d2e65bdee416c8eeb19ac7bd7ad4f4c23889f0ba81305189c32f05c85bd2ab1c05a57732aaf0bf61d7fdaae09dca
+  data.tar.gz: eb61addaa6bc1c3fcd7f9e2248995055d75e707b3db6155a1705c74d10180c9618345cea13fc6915569da421113c79b4f6bcaf3e3eb9670b472777115140ae90

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release Manager
-## Unreleased
-
+## v0.3.1
+ * Adds ability to add the module to the puppetfile at deployment time
 ## v0.3.0
  * Fixes color with fatal errors
  * Changes PuppetModule to use rugged commit commands

data/Gemfile

@@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] ||'https://rubygems.org'
 # Specify your gem's dependencies in release_manager.gemspec
 gem 'gitlab', '~> 3.7.0'
 gem 'rugged'
+gem 'highline', '~> 1.7'
 
 group :test do
   gem 'pry'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    release_manager (0.3.0)
+    release_manager (0.3.1)
       gitlab (~> 3.7.0)
+      highline (~> 1.7)
       rugged
 
 GEM
@@ -14,6 +15,7 @@ GEM
     gitlab (3.7.0)
       httparty (~> 0.13.0)
       terminal-table
+    highline (1.7.8)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -61,6 +63,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   gitlab (~> 3.7.0)
+  highline (~> 1.7)
   pry
   rake
   release_manager!

data/README.md

@@ -13,6 +13,7 @@ __________       .__                                   _____
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [ReleaseManager](#releasemanager)
+  - [Prerequisites](#prerequisites)
   - [Installation](#installation)
     - [Install directly from source](#install-directly-from-source)
   - [The workflow problem](#the-workflow-problem)
@@ -25,6 +26,7 @@ __________       .__                                   _____
     - [bump-changelog](#bump-changelog)
   - [Configuration Settings](#configuration-settings)
     - [Sandbox-create environment variables](#sandbox-create-environment-variables)
+  - [Ssh agent usage](#ssh-agent-usage)
   - [Development](#development)
   - [Contributing](#contributing)
   - [License](#license)
@@ -35,6 +37,17 @@ __________       .__                                   _____
 
 This gem provides workflow automations around releasing and deploying puppet modules within r10k environments.
 
+## Prerequisites 
+
+1. Must be running Gitlab 8.16+
+2. Must be using ssh keys with gitlab
+3. Must be using ssh-agent to handle git authentication
+4. Must be using Git
+5. Must be using r10k
+6. Must have a r10k-control repo (name can vary)
+7. Must have a Gitlab API Access token (per user)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -57,9 +70,7 @@ directly from source.
 
 ```
 gem install specific_install  # unless already installed
-gem specific_install <git url to release manager>  
-
-ie. gem specific_install git@github.com/nwops/release_manager.git
+gem specific_install https://github.com/nwops/release_manager  
 ```
 
 

data/lib/release_manager/module_deployer.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 require_relative 'puppetfile'
 require_relative 'puppet_module'
+require 'highline/import'
+
 class ModuleDeployer
   attr_reader :options
+  include ReleaseManager::Logger
 
   def initialize(opts)
     opts[:modulepath] = Dir.getwd if opts[:modulepath].nil? 
@@ -38,38 +41,51 @@ class ModuleDeployer
     @puppetfile ||= Puppetfile.new(puppetfile_path)
   end
 
+  # @param [PuppetModule] puppet_module - the puppet module to check for existance
+  # raises
+  def add_module(puppet_module)
+    unless puppetfile.mod_exists?(puppet_module.name)
+      answer = ask("The #{puppet_module.name} module does not exist, do you want to add it? (y/n): ", String) { |q| q =~ /y|n/i }.downcase
+      if answer == 'y'
+        puppetfile.add_module(puppet_module.name, git: puppet_module.repo, tag: "v#{puppet_module.version}") unless options[:dry_run]
+      end
+    end
+  end
+
   def run
     begin
       check_requirements
-      puts "Found module #{puppet_module.name} with version: #{latest_version}".green
+      logger.info "Deploying module #{puppet_module.name} with version: #{latest_version}"
       if options[:dry_run]
+        add_module(puppet_module)
         puts "Would have updated module #{puppet_module.name} in Puppetfile to version: #{latest_version}".green
         puts "Would have committed with message: bump #{puppet_module.name} to version: #{latest_version}".green if options[:commit]
         puts "Would have just pushed branch: #{puppetfile.current_branch} to remote: #{control_repo_remote}".green if options[:push]
       else
-        puts "Updated module #{puppet_module.name} in Puppetfile to version: #{latest_version}".green
+        add_module(puppet_module)
         puppetfile.write_version(puppet_module.name, latest_version)
         puppetfile.write_source(puppet_module.name, puppet_module.source)
         puppetfile.write_to_file
+        logger.info "Updated module #{puppet_module.name} in Puppetfile to version: #{latest_version}"
         if options[:commit]
           puppetfile.commit("bump #{puppet_module.name} to version #{latest_version}")
-          puts "Commited with message: bump #{puppet_module.name} to version #{latest_version}".green
+          logger.info "Commited with message: bump #{puppet_module.name} to version #{latest_version}"
         end
         if options[:push]
           puppetfile.push(control_repo_remote, puppetfile.current_branch)
-          puts "Just pushed branch: #{puppetfile.current_branch} to remote: #{control_repo_remote}".green
+          logger.info "Just pushed branch: #{puppetfile.current_branch} to remote: #{control_repo_remote}"
         end
       end
     rescue InvalidMetadataSource
-      puts "The puppet module's metadata.json source field must be a git url: ie. git@someserver.com:devops/module.git".red
+      logger.fatal "The puppet module's metadata.json source field must be a git url: ie. git@someserver.com:devops/module.git"
     rescue PuppetfileNotFoundException
-      puts "Cannot find the puppetfile at #{puppetfile_path}".red
+      logger.fatal "Cannot find the puppetfile at #{puppetfile_path}"
       exit -1
     rescue InvalidModuleNameException => e
-      puts e.message
+      logger.fatal e.message
       exit 1
     rescue ModNotFoundException
-      puts "Invalid module path for #{mod_path}".red
+      logger.fatal "Invalid module path for #{mod_path}"
       puts "This means that the metadata.json name field does not match\nthe module name found in the Puppetfile or this is not a puppet module".fatal
       exit -1
     end

data/lib/release_manager/puppetfile.rb

@@ -89,6 +89,16 @@ class Puppetfile
     mod
   end
 
+  # @param [String] name - the name of the mod you wish to find in the puppetfile
+  # @return [Boolean] - true if the module is found
+  def mod_exists?(name)
+    begin
+      !!find_mod(name)
+    rescue InvalidModuleNameException
+      false
+    end
+  end
+
   def write_version(mod_name, version)
     mod = find_mod(mod_name)
     mod.pin_version(version)

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/release_manager.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "gitlab", "~>3.7.0"
   spec.add_runtime_dependency "rugged"
+  spec.add_runtime_dependency "highline", '~> 1.7'
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement