release_manager 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f488ec3c5ca203a22ebc5fdc6c3f35659fc3ab
-  data.tar.gz: e0d8bc478030066ccaf0aea96a548bcda45461c1
+  metadata.gz: 0056b26bafb18d0a01df0610acfc187b5b894416
+  data.tar.gz: bd8a438f19dbee1ebb1ca73c277eac99b14222c9
 SHA512:
-  metadata.gz: bdf95bd7a453b7ae03e108d23808dfce2194e50dfd3a27680d0219ddb32ad05ed45534e282af17f12f3bb8a39e653f905cdc9786b899e6268865a8b5f0a964db
-  data.tar.gz: b9af8ec32da6a2743e822e3451b198d3663062d3866519f6fb19bbf1bab3c0703c66925f824c94d4cf8202b5cdeef677a41cd731d76575bbb4a79a774d1a3788
+  metadata.gz: 548c678ef78f0a13b3d2c9c6e40e1b97b12a64590cb5eb5c71595d3547e711e8bdbe98d7d88ddd3e61d305d0fb7d9715056fb47c9b923c392c12ef5ebcb1e5f1
+  data.tar.gz: fd8faf85ad2d821365a10d122c70683a4575db9769aaf9b54c765e07a8c59865229581c9863ba47a5a22f89d5bb8abcdddcb71b6f42b58014b17646970cf8f66

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Release Manager
 
 ## Unreleased
-
+ * Fixes #3 - release-mod fails when trying to sort tags
+ * Fixes #8 - files disappear from change set
+ * Fixes #1 - deploy-mod creates commit everytime
 ## 0.6.0
  * Adds the ability to release-mod to dump a specific SemVer release level
  * Fixes issue with changelog file not existing

data/Gemfile.lock

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

data/README.md

@@ -47,7 +47,7 @@ This gem provides workflow automations around releasing and deploying puppet mod
 6. Must have a r10k-control repo (name can vary)
 7. Must have a Gitlab API Access token (per user)
 8. Must have the libssh-dev library package installed
-
+9. Must tag code with version tags ie. `v1.2.3`
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -315,8 +315,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Develpment Environment Setup
 ### Setting up your Gitlab Instance
-1. Ensure you have docker installed
-2. `docker-compose up`
+1. Ensure you have docker and docker-compose installed
+2. run `docker-compose up` to start all the services
 3. Visit http://localhost:8000/
 4. Create a password  (password123)
 5. Login (root/password123)

data/lib/release_manager/errors.rb

@@ -14,4 +14,5 @@ class InvalidSshkey < Exception; end
 class InvalidBranchName < Exception; end
 class PatchError < Exception; end
 class AlreadyReleased < Exception; end
+class AlreadyDeployed < Exception; end
 class TagExists < Exception; end

data/lib/release_manager/git/utilites.rb

@@ -225,7 +225,7 @@ module ReleaseManager
         return add_all if file == '.'
         index = repo.index
         file.slice!(repo.workdir)
-        index.add(:path => file, :oid => Rugged::Blob.from_workdir(repo, file), :mode => 0100644)
+        index.add(:path => file, :oid => Rugged::Blob.from_workdir(repo, file), :mode => 0100644, valid: false)
       end
 
       # @param [String] file - the path to the patch file you want to apply
@@ -276,10 +276,6 @@ module ReleaseManager
         index.remove(file)
       end
 
-      def update_cli_index
-        `#{git_command} update-index --really-refresh`
-      end
-
       # @param [String] message - the message you want in the commit
       def create_commit(message)
         unless author_name and author_email
@@ -288,14 +284,14 @@ module ReleaseManager
         # get the index for this repository
         repo.status { |file, status_data| logger.debug "#{file} has status: #{status_data.inspect}" }
         index = repo.index
-        index.write
         options = {}
         options[:author] = author
         options[:message] = message
         options[:committer] = author
-        options[:parents] = repo.empty? ? [] : [repo.head.target_id].compact
+        options[:parents] = repo.empty? ? [] : [repo.head.target].compact
         options[:update_ref] = 'HEAD'
         options[:tree] = index.write_tree
+        index.write
         oid = Rugged::Commit.create(repo, options)
         if oid
           logger.info("Created commit #{message}")
@@ -303,7 +299,6 @@ module ReleaseManager
         else
           logger.warn("Something went wrong with the commit")
         end
-        update_cli_index # for some reason the command line doesn't refresh the index after committing.
         oid
       end
 

data/lib/release_manager/module_deployer.rb

@@ -68,7 +68,11 @@ class ModuleDeployer
       else
         puppetfile.write_version(puppet_module.name, latest_version)
         puppetfile.write_source(puppet_module.name, puppet_module.source)
-        puppetfile.write_to_file
+        updated = puppetfile.write_to_file
+        unless updated
+          logger.warn "Module #{puppet_module.name} with version #{latest_version} has already been deployed, skipping deployment"
+          return
+        end
         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}")

data/lib/release_manager/puppet_module.rb

@@ -84,8 +84,14 @@ class PuppetModule < WorkflowAction
    parts.join '.'
  end
 
+ # @return [Array<String>] - returns a array of version strings with the v in the name
+ def version_tags
+   tags.find_all {|tag| tag =~ /\Av\d/ }
+ end
+
+ # @return [String] -  the latest tag in a series of versioned tags
  def latest_tag
-   v = tags.sort do |a,b|
+   v = version_tags.sort do |a,b|
     Gem::Version.new(a.tr('v', '')) <=> Gem::Version.new(b.tr('v', ''))
    end
    v.last

data/lib/release_manager/puppetfile.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative 'control_mod'
 require_relative 'errors'
+require 'fileutils'
 require 'json'
 require 'release_manager/puppet_module'
 
@@ -139,7 +140,17 @@ class Puppetfile
     end
   end
 
+  def diff(a,b)
+    FileUtils.compare_stream(a,b)
+  end
+
+  # @return [Boolean] - true if writing to file occurred, false otherwise
   def write_to_file
+    contents = to_s
+    a = StringIO.new(contents)
+    b = File.new(puppetfile)
+    # do not write to the file if nothing changed
+    return false if FileUtils.compare_stream(a,b)
     File.write(puppetfile, to_s)
   end
 

data/lib/release_manager/vcs_manager/gitlab_adapter.rb

@@ -250,17 +250,3 @@ module ReleaseManager
     end
   end
 end
-
-#class Gitlab::Client
-  # monkey patch correct api method until next version is released
-#  module Commits
-#    def create_commit(project, branch, message, actions, options={})
-#      payload = {
-#          branch: branch,
-#          commit_message: message,
-#          actions: actions,
-#      }.merge(options)
-#      post("/projects/#{url_encode project}/repository/commits", body: payload)
-#    end
-#  end
-#end

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab