release_manager 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1eb100282aec6a63243d57a5d99e057a16a6f72
-  data.tar.gz: 80945c3821447d4f1611dfaef6a79074073ee204
+SHA256:
+  metadata.gz: 40f987ae556eeffe3ab2fca6e4aba94cc54ca9660ce44c7f1780827a1b2cab74
+  data.tar.gz: 6e0612667bd4a50e5cd332d6825ae44415e1080dd1d7abeafc6fcad41847cd23
 SHA512:
-  metadata.gz: e1de851fb872828299abc3446836fcc0994b5e8ce35c6e8c26d3c507c7ca88085b38427e3bafe4ba0176228b3cce4ba7277fb9966075b77ba743d0f93aeb9721
-  data.tar.gz: 3003adc21f31b607ec98542dbf0e8f54516cfc82607689320b6293ef9cc411176ccfc62924e756d927a8e080edba7ff9b8d20a2dc0ff021a7aa584d784974eb2
+  metadata.gz: 9466b5af4b5be8e33b696f89e5601684226c4a7585ffcfd53ae990674793d539304b3fcdfda81450a7067bebed0386c8b42f2b6a3a6a3b25379404f3751c1560
+  data.tar.gz: a04bbe4f4b2783f529ee58793ccf88e9de8c2fed7ef73d4cc6884d40d60e09e442ad0c4111fe56a75431af6a7b53f154e83f566e72f65356033a3e487a532175

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Release Manager
 
+## 0.9.1
+ * Adds ability to publish release notes when tagging remotely
+
 ## 0.9.0
  * Adds ability to push a single tag
  

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release_manager (0.9.0)
+    release_manager (0.9.1)
       gitlab (~> 4.2.0)
       highline (~> 1.7)
       rugged (~> 0.26)
@@ -71,4 +71,4 @@ DEPENDENCIES
   rugged (~> 0.26)
 
 BUNDLED WITH
-   1.15.4
+   1.16.2

data/README.md

@@ -407,6 +407,35 @@ ssh-add
 
 ```
 
+### Unable to exchange encryption keys
+If you see an error message related to `Unable to exchange encryption keys` you may be dealing with an issue on your git server openssh
+does not support the key exchange that libssh2 supports.  Libssh2 is used by release_manager so it is important they can negotiate on the same algorithm.
+
+There are two possible fixes for this.  
+
+* Update libssh2 to 1.7.x+
+
+You can grab the libssh2 library on your puppetserver with r10k should you not have access to libssh2-1.7.0+
+
+`cp /opt/puppetlabs/server/apps/r10k/lib/libssh2.so.1.0.1 /usr/lib64/libssh2.so.1.0.1`
+
+Note: you will actually want to copy the the library whereever release_manager is used.  Additionally you need to recompile
+the rugged gem,  only after updating libssh2 in /usr/lib64
+
+`gem uninstall rugged && gem install rugged  `
+
+
+If you don't want to update libssh2 you should add support more more algorithms on the git server.  
+
+
+```
+# /etc/ssh/sshd_config
+
+KexAlgorithms hmac-sha2-512
+```
+
+Note:  you should have more algorithms as that is an example only.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/release_manager/changelog.rb

@@ -35,6 +35,7 @@ class Changelog < WorkflowAction
     @root_dir
   end
 
+  # Create the changelog entries and commit
   # @param remote [Boolean] - if the commit is a remote git on the vcs server
   # @return [String] - sha of the commit
   def run(remote = false, branch = 'master')
@@ -79,6 +80,23 @@ class Changelog < WorkflowAction
     !!changelog_lines.each_index.find {|index| changelog_lines[index] =~ /\A\s*\#{2}\s*Version #{version}/i }
   end
 
+  # @return [Array] - array of lines of the unreleased content, text between unreleased and next version
+  def get_unreleased_content
+    unreleased_index
+    start_content = changelog_lines.slice((unreleased_index + 1), changelog_lines.count)
+    start_content.slice_when {|a,b| b.downcase.start_with?('## version') }.map {|d| d}.first
+  end
+
+  # @return [Array] - array of lines of the specified version content, text between specified version and next version
+  # @param [String] - the version of content you want
+  # @note - returns empty string if version is not found
+  def get_version_content(version)
+    start_index = changelog_lines.find_index {|line| line.downcase.include?("version #{version}") }
+    return nil unless start_index
+    start_content = changelog_lines.slice((start_index + 1), changelog_lines.count)
+    start_content.slice_when {|a,b| b.downcase.start_with?('## version') }.map {|d| d}.first
+  end
+
   # @returns [Array[String]] - inserts the version header in the change log and returns the entire array of lines
   def update_unreleased
     time = Time.now.strftime("%B %d, %Y")

data/lib/release_manager/git/credentials.rb

@@ -74,7 +74,6 @@ module ReleaseManager
       # this method does currently now work
       def ssh_key_credentials(url = nil)
         logger.error("Must use ssh-agent, please run ssh-agent zsh, then ssh-add to load your ssh key")
-        exit 1
         unless File.readable?(global_private_key)
           raise Exception.new("Unable to use SSH key auth for %{url}: private key %{private_key} is missing or unreadable" % {url: url.inspect, private_key: global_private_key.inspect} )
         end

data/lib/release_manager/puppet_module.rb

@@ -140,12 +140,13 @@ class PuppetModule < WorkflowAction
 
  # @param remote [Boolean] - create the tag remotely using the remote VCS
  # @param id [String] - the commit id to tag to
- def tag_module(remote = false, id = nil)
+ # @param remote [Boolean] - use the vcs adapter instead of local tag
+ # @param release_notes [Boolean] - add release notes to the tag when remote is true
+ def tag_module(remote = false, id = nil, release_notes = nil)
    id ||= repo.head.target_id
    if remote
-     # TODO add release_notes as the last argument, currently nil
      # where we get the latest from the changelog
-     create_tag(source, "v#{version}", id, "v#{version}", nil)
+     create_tag(source, "v#{version}", id, "v#{version}", release_notes)
    else
      create_local_tag("v#{version}", id)
    end

data/lib/release_manager/release.rb

@@ -34,12 +34,18 @@ class Release
     puppet_module.next_version(level)
   end
 
+  def release_notes
+    notes = changelog.get_version_content(version) || changelog.get_unreleased_content || []
+    notes.join(" ")
+  end
+
+  # @param id [String] - the commit id to tag to
   def tag(id)
     if dry_run?
       logger.info "Would have just tagged the module to #{version}"
       return
     end
-    puppet_module.tag_module(options[:remote], id)
+    puppet_module.tag_module(options[:remote], id, release_notes)
   end
 
   def bump
@@ -55,14 +61,17 @@ class Release
     puppet_module.commit_metadata(options[:remote])
   end
 
+  def changelog
+    @changelog ||= Changelog.new(puppet_module.path, version, {:commit => true})
+  end
+
   # @return [String] - sha of the commit
   def bump_log
     if dry_run?
       logger.info "Would have just bumped the CHANGELOG to version #{version}"
       return
     end
-    log = Changelog.new(puppet_module.path, version, {:commit => true})
-    log.run(options[:remote], puppet_module.src_branch)
+    changelog.run(options[:remote], puppet_module.src_branch)
   end
 
   # @param id [String] - a ref spec to push

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Release tools for puppet code