release_manager 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5f2fca5358264908a1a51ed4cb1af63cc69104
-  data.tar.gz: 409fdbe6392f38daf968ca3379524d70b379ae2b
+  metadata.gz: 364942ebd85562ce0608b558d9b670bc298a9b4a
+  data.tar.gz: f2e2e0cefae600b7c16d7518c65ea4f5f4159f3b
 SHA512:
-  metadata.gz: b0b5862f7aceb14806d670ab9cc6a743533ec9ae17a25eb8b1f7ee5f803bc4ee7f68252e8c0af246d29a9da8aafe9db779baf377ee2494ceb10728359357dfe2
-  data.tar.gz: e61f58c5af387848e48903a7df2998f28b6474f0b465d529fb42958f632e56ba4713c9147d28ebf868c4a564fd2b7577b974a30fb4f9da38eb596b03ed9d504c
+  metadata.gz: cd0dd4f644d138ab707498fe7d689ff2c950d5b742023ff5ad9f5f9398d409c0b52ee86c5fea7c933a9610bac9f263fae1ebc0605b5a0cc7659dc3cc6aa7fd45
+  data.tar.gz: 515d6a43667012fd475baeea10989d3f83c6a15563eb9641b053b02550ed8b4ada0a8f4ea3234e22e1903a4d5e572f289e4b0c329d9af61d08e47ca9c659636d

data/.env

@@ -1,3 +1,3 @@
 export GITLAB_API_ENDPOINT='http://web/api/v3'
 export GITLAB_API_PRIVATE_TOKEN='A_zJJfgE8P-8mFGK2_r9'
-export R10K_REPO_URL="git@web:devops/control-repo.git"
+export R10K_REPO_URL="git@web:devops/control-repo.git"

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+.env
 /.yardoc
 .idea
 /_yardoc/

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Manager
 ## Unreleased
-
+## 0.5.2
+ * Adds proper error handling when missing git author name and email with r10k-deploy
+## 0.5.1
+ * Fixes missing error object when credentials are not present
+ * Fixes error when deploy-r10k is used and remote setting was not set
 ## 0.5.0
  * Adds more error handling instead of stack dumps
  * Updates gitlab gem to 4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release_manager (0.5.0)
+    release_manager (0.5.2)
       gitlab (~> 4.2.0)
       highline (~> 1.7)
       rugged (~> 0.26)

data/lib/release_manager/cli/deploy_r10k_cli.rb

@@ -56,6 +56,7 @@ Summary: Deploys the source ref into the dest branch by diffing the two and appl
       options[:puppetfile] = options[:puppetfile] || puppetfile_path
       options[:src_ref] ||= ARGV[0]
       options[:dest_ref] ||= ARGV[1]
+      options[:remote] = true
       validate(options)
       path = File.dirname(options[:puppetfile])
       R10kDeployer.run(path, options)

data/lib/release_manager/git/utilites.rb

@@ -199,12 +199,12 @@ module ReleaseManager
 
       # @return [String] - the author name found in the config
       def author_name
-        repo.config.get('user.name') || Rugged::Config.global.get('user.name')
+        repo.config.get('user.name') || Rugged::Config.global.get('user.name') || ENV['GIT_USER_NAME']
       end
 
       # @return [String] - the author email found in the config
       def author_email
-        repo.config.get('user.email') || Rugged::Config.global.get('user.email')
+        repo.config.get('user.email') || Rugged::Config.global.get('user.email') || ENV['GIT_USER_EMAIL']
       end
 
       # @return [Hash] the author information used in a commit message
@@ -281,6 +281,9 @@ module ReleaseManager
 
       # @param [String] message - the message you want in the commit
       def create_commit(message)
+        unless author_name and author_email
+          raise GitError.new("Git username and email must be set, current: #{author.inspect}")
+        end
         # get the index for this repository
         repo.status { |file, status_data| logger.debug "#{file} has status: #{status_data.inspect}" }
         index = repo.index

data/lib/release_manager/r10k_deployer.rb

@@ -39,6 +39,9 @@ class R10kDeployer
       deploy.check_requirements
       deploy.logger.info "Deploying R10k-Control #{options[:dest_ref]} with version: #{options[:src_ref]}"
       deploy.run
+    rescue GitError => e
+      deploy.logger.fatal(e.message)
+      code = 1
     rescue Gitlab::Error::Forbidden => e
       logger.fatal(e.message)
       logger.fatal("You don't have access to modify the repository")
@@ -99,6 +102,7 @@ class R10kDeployer
       control_repo.apply_patch(patchfile.path)
       control_repo.add_all
     end
+    # since we added everything locally we don't create a remote commit
     successful_commit = control_repo.commit(message, nil, nil, false)
     control_repo.push_branch('myfork', branch_name, true) if successful_commit
     mr = control_repo.create_merge_request(control_repo.url, message, {

data/lib/release_manager/remote_release.rb

@@ -42,7 +42,7 @@ class RemoteRelease < Release
       logger.fatal(e.message)
       logger.fatal("This probably means the user attached to the token does not have access")
       exit -1
-    rescue Gitlab::Error::MissingCredentials
+    rescue Gitlab::Error::MissingCredentials => e
       logger.fatal(e.message)
       exit -1
     rescue Gitlab::Error::Forbidden => e

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab