release_manager 0.4.0 → 0.5.0

data/lib/release_manager/vcs_manager/gitlab_adapter.rb

@@ -57,12 +57,13 @@ module ReleaseManager
 
       # https://docs.gitlab.com/ee/api/members.html
       def add_permissions(project_id, user_ids = [], access_level = 20)
+        user_ids ||= []  # default to empty if nil
         user_ids.map {|id| add_permission(id, project_id, access_level)}
       end
 
       # @return String - the branch name that was created
       def create_repo_branch(repo_id, branch_name)
-        Gitlab.repo_create_branch(repo_id, branch_name)
+        client.repo_create_branch(repo_id, branch_name)
       end
 
       def clone_repo(branch_name, mod_name, url, repos_dir)
@@ -70,43 +71,196 @@ module ReleaseManager
         Rugged::Repository.clone_at(url, path, checkout_branch: branch_name)
       end
 
-      # TODO: extract this out to an adapter
-      # replaces namespace from the url with the supplied or default namespace
-      def swap_namespace(url, namespace = nil)
-        url.gsub(/\:([\w-]+)\//, ":#{namespace || Gitlab.user.username}/")
-      end
-
+      # TODO verify the proposed fork does not match the upstream
       # @return [Gitlab::ObjectifiedHash] Information about the forked project
       # @param [ControlMod] the module you want to fork
-      # TODO: extract this out to an adapter
-      # def create_repo_fork(url, namespace = nil )
-      #   new_url = swap_namespace(url, namespace)
-      #   repo = repo_exists?(new_url)
-      #   unless repo
-      #     upstream_repo_id = repo_id(url)
-      #     logger.info("Forking project from #{url} to #{new_url}")
-      #     repo = Gitlab.create_fork(upstream_repo_id)
-      #     # gitlab lies about having completed the forking process, so lets sleep until it is actually done
-      #     loop do
-      #       sleep(1)
-      #       break if repo_exists?(repo.ssh_url_to_repo)
-      #     end
-      #   end
-      #   repo
-      # end
+      def create_repo_fork(url, options = {} )
+        namespace = options[:namespace] || client.user.username
+        new_url = swap_namespace(url, namespace)
+        repo = repo_exists?(new_url)
+        unless repo or url == new_url
+          upstream_repo_id = name_to_id(repo_id(url))
+          logger.info("Forking project from #{url} to #{new_url}")
+          repo = client.create_fork(upstream_repo_id)
+          # gitlab lies about having completed the forking process, so lets sleep until it is actually done
+          loop do
+            sleep(1)
+            break if repo_exists?(repo.ssh_url_to_repo)
+          end
+        end
+        add_permissions(repo.id, options[:default_members])
+        repo
+      end
+
+      # @param [String] url - a git url
+      # @param  [String]  tag_name The name of the new tag.
+      # @param  [String]  ref The ref (commit sha, branch name, or another tag) the tag will point to.
+      # @param  [String]  message Optional message for tag, creates annotated tag if specified.
+      # @param  [String]  description Optional release notes for tag.
+      # @return [Gitlab::ObjectifiedHash]
+      def create_tag(url, tag_name, ref, message = nil, description = nil)
+        id = repo_id(url)
+        logger.info("Creating tag #{tag_name} which points to #{ref}")
+        client.create_tag(id, tag_name, ref, message, description)
+      end
+
+      # Creates a single commit with one or more changes
+      #
+      #
+      # @example
+      # create_commit(2726132, 'master', 'refactors everything', [{action: 'create', file_path: '/foo.txt', content: 'bar'}])
+      # create_commit(2726132, 'master', 'refactors everything', [{action: 'delete', file_path: '/foo.txt'}])
       #
-      # # @param [String] url - the git url of the repository
-      # # @return [Boolean] returns the project object (true) if found, false otherwise
-      # # TODO: extract this out to an adapter
-      # def repo_exists?(url)
-      #   upstream_repo_id = repo_id(url)
-      #   begin
-      #     Gitlab.project(upstream_repo_id)
-      #   rescue
-      #     false
-      #   end
-      # end
+      # @param [String] url - a git url
+      # @param [String] branch the branch name you wish to commit to
+      # @param [String] message the commit message
+      # @param [Array[Hash]] An array of action hashes to commit as a batch. See the next table for what attributes it can take.
+      # @option options [String] :author_email the email address of the author
+      # @option options [String] :author_name the name of the author
+      # @return [Gitlab::ObjectifiedHash] hash of commit related data
+      def vcs_create_commit(url, branch, message, actions, options={})
+        if actions.empty?
+          logger.info("Nothing to commit, no changes")
+          return false
+        end
+        project = name_to_id(repo_id(url))
+        logger.debug("Creating commit for #{url} on branch #{branch} with project id: #{project}")
+        logger.info("Creating commit #{message}")
+        client.create_commit(project, branch, message, actions, options)
+      end
+
+      # Creates a merge request.
+      #
+      # @example
+      #   create_merge_request(5, 'New merge request',
+      #     { source_branch: 'source_branch', target_branch: 'target_branch' })
+      #   create_merge_request(5, 'New merge request',
+      #     { source_branch: 'source_branch', target_branch: 'target_branch', assignee_id: 42 })
+      #
+      # @param [String] url - a git url
+      # @param  [String] title The title of a merge request.
+      # @param  [Hash] options A customizable set of options.
+      # @option options [String] :source_branch (required) The source branch name.
+      # @option options [String] :target_branch (required) The target branch name.
+      # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+      # @option options [Integer] :target_project_url (optional) The target project url.
+      # @return [Gitlab::ObjectifiedHash] Information about created merge request.
+      def create_merge_request(url, title, options={})
+        logger.debug("Creating merge request at #{url}")
+        project = name_to_id(repo_id(url))
+        options[:target_project_id] = name_to_id(repo_id(options.delete(:target_project_url))) if options[:target_project_url]
+        raise ArgumentError unless options[:source_branch] and options[:target_branch]
+        output = client.create_merge_request(project, title, options)
+        logger.info("Merge request created: #{output.web_url}")
+        output
+      end
+
+      # @param Array[Hash] the changed files in the commit or all the commits in the diff between src and dst
+      # @return Array[Hash] the gitlab specific hash of action hashes
+      def diff_2_commit(diff_obj)
+        diff_obj.map do |obj|
+          {
+              action: convert_status(obj[:status]),
+              file_path: obj[:new_path],
+              content: obj[:content]
+          }
+        end
+      end
+
+      # @param [String] url - a git url
+      # @param  [String]  name The name of the new branch.
+      # @param  [String]  ref The ref (commit sha, branch name, or another tag) the tag will point to.
+      def vcs_create_branch(url, name, ref)
+        project = name_to_id(repo_id(url))
+        logger.info("Creating remote branch #{name} from #{ref}")
+        client.create_branch(project, name, ref)
+      end
+
+      def remote_tags(url)
+        project = name_to_id(repo_id(url))
+        client.tags(project).map(&:name)
+      end
+
+      def remote_tag_names(url)
+        remote_tags(url)
+      end
+
+      def remote_tag_exists?(url, tag)
+        begin
+          project = name_to_id(repo_id(url))
+          client.tag(project, tag)
+        rescue Gitlab::Error::NotFound
+          false
+        end
+      end
+
+      private
+
+      # converts the git status symbol to the status required for gitlab
+      # @param [Symbol] status the status symbol
+      # @return [String] the string conversion of the status to gitlab action name
+      def convert_status(status)
+        case status
+          when :added
+            'create'
+          when :deleted
+            'delete'
+          when :modified
+            'update'
+          when :renamed
+            'move'
+          else
+            raise ArgumentError
+        end
+      end
+
+      # @param namespace [String] - the namespace / project name
+      # @return [Integer] - the id number of the project
+      def name_to_id(namespace)
+        p = client.project(namespace)
+        p.id
+      end
+
+      # @param [String] url - a git url
+      # @return [String] a string representing the project id from gitlab
+      # gets the project id from gitlab using the remote API
+      def repo_id(url)
+        # ie. git@server:namespace/project.git
+        proj = url.match(/:(.*\/.*)\.git/)
+        raise RepoNotFound unless proj
+        proj[1]
+      end
+
+      # @param [String] url - the git url of the repository
+      # @return [Boolean] returns the project object (true) if found, false otherwise
+      def repo_exists?(url)
+        upstream_repo_id = repo_id(url)
+        begin
+          client.project(upstream_repo_id)
+        rescue Gitlab::Error::NotFound => e
+          false
+        end
+      end
+
+      # replaces namespace from the url with the supplied or default namespace
+      def swap_namespace(url, namespace = nil)
+        url.gsub(/\:([\w-]+)\//, ":#{namespace || client.user.username}/")
+      end
 
     end
   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/vcs_manager/vcs_adapter.rb

@@ -17,6 +17,109 @@ module ReleaseManager
       def add_permission(user, repo)
         raise NotImplementedError
       end
+
+      def create_repo_fork(url, options = {} )
+        raise NotImplementedError
+      end
+
+      def swap_namespace(url, namespace = nil)
+        raise NotImplementedError
+      end
+
+      def clone_repo(mod_name, url)
+        raise NotImplementedError
+      end
+
+      def create_repo_branch(repo_id, branch_name)
+        raise NotImplementedError
+      end
+
+      def repo_exists?(url)
+        raise NotImplementedError
+      end
+
+      def repo_id(url)
+        raise NotImplementedError
+      end
+
+      # @param [String] url - a git url
+      # @param  [String]  name The name of the new branch.
+      # @param  [String]  ref The ref (commit sha, branch name, or another tag) the tag will point to.
+      def vcs_create_branch(url, name, ref)
+        raise NotImplementedError
+      end
+
+      # @param [String] url - a git url
+      # @param  [String]  mr_id The id of the merge request
+      def rebase_mr(url, mr_id)
+        raise NotImplementedError
+      end
+
+      # @param [String] url - a git url
+      # @param  [String]  tag_name The name of the new tag.
+      # @param  [String]  ref The ref (commit sha, branch name, or another tag) the tag will point to.
+      # @param  [String]  message Optional message for tag, creates annotated tag if specified.
+      # @param  [String]  description Optional release notes for tag.
+      # @return [Gitlab::ObjectifiedHash]
+      def create_tag(url, tag_name, ref, message = nil, description = nil)
+        raise NotImplementedError
+      end
+
+      # Creates a single commit with one or more changes
+      #
+      # @example
+      # create_commit(2726132, 'master', 'refactors everything', [{action: 'create', file_path: '/foo.txt', content: 'bar'}])
+      # create_commit(2726132, 'master', 'refactors everything', [{action: 'delete', file_path: '/foo.txt'}])
+      #
+      # @param [String] url - a git url
+      # @param [String] branch the branch name you wish to commit to
+      # @param [String] message the commit message
+      # @param [Array[Hash]] An array of action hashes to commit as a batch. See the next table for what attributes it can take.
+      # @option options [String] :author_email the email address of the author
+      # @option options [String] :author_name the name of the author
+      # @return [Gitlab::ObjectifiedHash] hash of commit related data
+      def vcs_create_commit(url, branch, message, actions, options={})
+        raise NotImplementedError
+      end
+
+      # Creates a merge request.
+      #
+      # @example
+      #   create_merge_request(5, 'New merge request',
+      #     { source_branch: 'source_branch', target_branch: 'target_branch' })
+      #   create_merge_request(5, 'New merge request',
+      #     { source_branch: 'source_branch', target_branch: 'target_branch', assignee_id: 42 })
+      #
+      # @param  [Integer, String] project The ID or name of a project.
+      # @param  [String] title The title of a merge request.
+      # @param  [Hash] options A customizable set of options.
+      # @option options [String] :source_branch (required) The source branch name.
+      # @option options [String] :target_branch (required) The target branch name.
+      # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+      # @option options [Integer] :target_project_id (optional) The target project ID.
+      # @return [Gitlab::ObjectifiedHash] Information about created merge request.
+      def create_merge_request(project, title, options={})
+        raise NotImplementedError
+      end
+
+      # @param Array[Hash] the changed files in the commit or all the commits in the diff between src and dst
+      # @return Array[Hash]
+      def diff_2_commit(diff_obj)
+        raise NotImplementedError
+      end
+
+      def remote_tags(url)
+        raise NotImplementedError
+      end
+
+      def remote_tag_names(url)
+        raise NotImplementedError
+      end
+
+      def remote_tag_exists?(url, tag)
+        raise NotImplementedError
+      end
+
     end
   end
 end

data/lib/release_manager/vcs_manager.rb

@@ -1,7 +1,18 @@
 require 'release_manager/vcs_manager/gitlab_adapter'
-
+require 'forwardable'
 module ReleaseManager
   module VCSManager
+    extend Forwardable
+    attr_accessor :vcs
+    def_delegators :vcs, :add_ssh_key, :add_permission, :create_repo_fork, :swap_namespace, :create_tag,
+                   :clone_repo, :create_repo_branch, :repo_exists?, :repo_id, :add_permissions,
+                   :vcs_create_commit, :create_merge_request, :diff_2_commit, :vcs_create_branch, :rebase_mr,
+                   :remote_tags, :remote_tag_names, :remote_tag_exists?
+
+    def vcs
+      @vcs ||= ReleaseManager::VCSManager.default_instance
+    end
+
     def self.default_instance
       ReleaseManager::VCSManager::GitlabAdapter.create
     end

data/lib/release_manager/version.rb

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

data/release_manager.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency "gitlab", "~>3.7.0"
-  spec.add_runtime_dependency "rugged"
+  spec.add_runtime_dependency "gitlab", "~> 4.2.0"
+  spec.add_runtime_dependency "rugged", "~> 0.26"
   spec.add_runtime_dependency "highline", '~> 1.7'
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "pry"

data/scratchcode.rb

@@ -0,0 +1,13 @@
+if remote
+  raise NotImplemented
+  diff_obj = control_repo.create_diff_obj(src_ref, dest_ref)
+  actions = diff_2_commit(diff_obj)
+  vcs_create_branch(url, branch_name, dest_ref)
+  control_repo.commit(message, diff_obj, branch_name, remote)
+  #rebase_mr(url, mr.id)
+  #commit = vcs_create_commit(control_repo.url, branch_name, message, actions)
+else
+
+  opts.on('-r', '--remote-deploy', "Perform a remote deploy (For CI systems)") do |c|
+    options[:remote] = c
+  end

data/setup_repos.rb

@@ -32,6 +32,9 @@ def create_control_repo
   begin
     proj = client.create_project('control-repo', namespace_id: devops_group.id)
     client.create_branch(proj.id, 'dev')
+    client.create_branch(proj.id, 'qa')
+    client.create_branch(proj.id, 'integration')
+    client.create_branch(proj.id, 'acceptance')
     client.create_branch(proj.id, 'production')
     create_puppet_file(proj)
   rescue Gitlab::Error::BadRequest => e
@@ -86,10 +89,10 @@ def mod(name, *args)
   puppetfile_content << "mod '#{name}',\n  #{data}\n\n"
 end
 
-eval(modules)
-create_control_repo
-
-client.create_user('joe@foo.org', 'password', 'joe', { name: 'Joe Smith' })
+# eval(modules)
+# create_control_repo
+#
+# client.create_user('joe@foo.org', 'password', 'joe', { name: 'Joe Smith' })
 
 # add the ssh key
 # create_ssh_key(title, key)

data/test_release.sh

@@ -0,0 +1,3 @@
+puts `rm -rf ~/repos`
+puts `bundle exec sandbox-create -n box12323 -m apache`
+bundle exec release-mod -m ~/repos/apache/`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ email:
 executables:
 - bump-changelog
 - deploy-mod
+- deploy-r10k
 - release-mod
 - sandbox-create
 extensions: []
@@ -123,6 +124,7 @@ files:
 - ".dockerignore"
 - ".env"
 - ".gitignore"
+- ".gitlab-ci-dev.yml"
 - ".rspec"
 - CHANGELOG.md
 - Dockerfile
@@ -137,11 +139,14 @@ files:
 - docker-compose.yml
 - exe/bump-changelog
 - exe/deploy-mod
+- exe/deploy-r10k
 - exe/release-mod
 - exe/sandbox-create
 - lib/release_manager.rb
 - lib/release_manager/changelog.rb
+- lib/release_manager/cli/bump_changelog_cli.rb
 - lib/release_manager/cli/deploy_mod_cli.rb
+- lib/release_manager/cli/deploy_r10k_cli.rb
 - lib/release_manager/cli/release_mod_cli.rb
 - lib/release_manager/cli/sandbox_create_cli.rb
 - lib/release_manager/control_mod.rb
@@ -153,7 +158,9 @@ files:
 - lib/release_manager/module_deployer.rb
 - lib/release_manager/puppet_module.rb
 - lib/release_manager/puppetfile.rb
+- lib/release_manager/r10k_deployer.rb
 - lib/release_manager/release.rb
+- lib/release_manager/remote_release.rb
 - lib/release_manager/sandbox.rb
 - lib/release_manager/vcs_manager.rb
 - lib/release_manager/vcs_manager/gitlab_adapter.rb
@@ -161,7 +168,10 @@ files:
 - lib/release_manager/version.rb
 - lib/release_manager/workflow_action.rb
 - release_manager.gemspec
+- scratchcode.rb
 - setup_repos.rb
+- test_release.sh
+- test_sandbox.rb
 homepage: ''
 licenses:
 - MIT