cimas 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9394871c2e095def57e7674194b7a43239da13230d5e5ff6c1278258deae56da
-  data.tar.gz: de2bfd5e44818ca43dcccdfc3a965542edf1c3352ce120c462182ee30a525427
+  metadata.gz: 914081d7dffac8d44caecd31568adc36ca7b87d1493cdd90840d3f53e44d5f9d
+  data.tar.gz: 78d8cf640851b093868598702abd538c9b239f7614eba62525de249b572d4704
 SHA512:
-  metadata.gz: 8df40444ecb07044787e228c2a3998fcb3432db947b84d71f70e0c8d0783f137ece83e22d9a9d5604b634123c3ef3a15a050abd96360ac82be3c4f3bf6733e5a
-  data.tar.gz: 63fdae72e4738e64dd29b15ee2332f49bb842c885f8056f52dce8ff2bac3b4e9646ac14bead264f859acd4c0974e1263ef9c8fe6a03f8dc598bef41961af0a34
+  metadata.gz: fb099628d653c820358e6e6ad4c4458e96e187dbe7e04613842e434dd12ad322ab92d7352713dbfdb4c2deb1fb036c96ac44714b87c88cf30ca01affdc57b8c4
+  data.tar.gz: 4fa7ebbe5c44d21a33134571637da703aaca216545ecd6ab441e640c184c231a9e884f74966088d0029457b3896b0c1d602765e028f91867ad896db6cada3626

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cimas (0.1.0)
+    cimas (0.1.3)
       git
       octokit
       travis

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/cimas.gemspec

@@ -1,7 +1,5 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cimas"
 require "cimas/version"
 
 Gem::Specification.new do |spec|

data/exe/cimas

@@ -150,10 +150,10 @@ subcommands = {
     opts.on("-g GROUP1,GROUP2,GROUPX", Array, "Groups to update") do |groups|
       options['groups'] = groups
     end
-    # TODO: implement
-    # opts.on("--force", "Force push (with commit amend)") do |force|
-    #   options['force_push'] = force
-    # end
+
+    opts.on("--force", "Force push (with commit amend)") do |force|
+      options['force_push'] = force
+    end
   end,
   'open-prs' => OptionParser.new do |opts|
     opts.banner = "Usage: cimas open-pr [options]"

data/lib/cimas.rb

@@ -1,5 +1,13 @@
-require "cimas/cli/command"
 require "cimas/version"
+require "cimas/cli/command"
+require "cimas/repository"
 
 module Cimas
+  def self.root
+    File.dirname(__dir__)
+  end
+
+  def self.root_path
+    Pathname.new(Cimas.root)
+  end
 end

data/lib/cimas/cli/command.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'yaml'
 require 'net/http'
 require 'git'
+require 'cimas'
 # require 'travis/client/session'
 
 module Cimas
@@ -113,9 +114,6 @@ module Cimas
             next
           end
 
-          branch = repo['branch']
-          files = repo['files']
-
           repo_dir = File.join(repos_path, repo_name)
           unless File.exist?(repo_dir)
             puts "[ERROR] #{repo_name} is missing in #{repos_path}, skipping sync for it."
@@ -124,13 +122,13 @@ module Cimas
 
           dry_run("Copying files to #{repo_name} and staging them") do
             g = Git.open(repo_dir)
-            g.checkout(branch)
-            g.reset_hard(branch)
+            g.checkout(repo.branch)
+            g.reset_hard(repo.branch)
             g.clean(force: true)
 
             puts "Syncing and staging files in #{repo_name}..."
 
-            files.each do |target, source|
+            repo.files.each do |target, source|
               # puts "file #{source} => #{target}"
               source_path = File.join(config_master_path, source)
               target_path = File.join(repos_path, repo_name, target)
@@ -163,9 +161,6 @@ module Cimas
             next
           end
 
-          branch = repo['branch']
-          files = repo['files']
-
           repo_dir = File.join(repos_path, repo_name)
           unless File.exist?(repo_dir)
             puts "[ERROR] #{repo_name} is missing in #{repos_path}, skipping diff for it."
@@ -247,8 +242,7 @@ module Cimas
       end
 
       def repo_by_name(name)
-        # puts "getting repository for #{name}"
-        data['repositories'][name]
+        Cimas::Repository.new(name, data["repositories"][name])
       end
 
       def pull
@@ -256,17 +250,19 @@ module Cimas
         filtered_repo_names.each do |repo_name|
 
           repo = repo_by_name(repo_name)
+
           if repo.nil?
             puts "[WARNING] #{repo_name} not configured, skipping."
             next
           end
 
-          branch = repo['branch']
-          files = repo['files']
-
           repo_dir = File.join(repos_path, repo_name)
           unless File.exist?(repo_dir)
-            puts "[ERROR] #{repo_name} is missing in #{repos_path}, skipping pull for it."
+            puts(
+              "[ERROR] #{repo_name} is missing in #{repos_path}, " \
+              " skipping pull for it."
+            )
+
             next
           end
 
@@ -274,10 +270,9 @@ module Cimas
 
           dry_run("Pulling from #{repo_name}...") do
             puts "Pulling from #{repo_name}..."
-            g.reset_hard(branch)
-            g.checkout(branch)
+            g.reset_hard(repo.branch)
+            g.checkout(repo.branch)
             g.pull
-            # g.fetch(g.remotes.first)
           end
         end
 
@@ -322,6 +317,7 @@ module Cimas
 
         filtered_repo_names.each do |repo_name|
           repo = repo_by_name(repo_name)
+
           if repo.nil?
             puts "[WARNING] #{repo_name} not configured, skipping."
             next
@@ -334,11 +330,13 @@ module Cimas
           end
 
           g = Git.open(repo_dir)
-          # g.reset_hard(attribs['branch'])
-
           dry_run("Pushing branch #{push_to_branch} (commit #{g.object('HEAD').sha}) to #{g.remotes.first}:#{repo_name}") do
-            g.branch(push_to_branch).checkout
+            puts "repo.branch #{repo.branch}"
+            g.checkout(repo.branch)
+            g.reset(repo.branch)
+            g.branch(push_to_branch).delete
             g.add(all: true)
+            g.branch(push_to_branch).checkout
 
             if g.status.changed.empty? &&
                 g.status.added.empty? &&
@@ -346,7 +344,8 @@ module Cimas
 
               puts "Skipping commit on #{repo_name}, no changes detected."
             else
-              g.commit_all(commit_message)
+              puts "Committing on #{repo_name}."
+              g.commit_all(commit_message)#, amend: true)
             end
 
             # Still push even if there was no commit, as the remote branch
@@ -354,10 +353,10 @@ module Cimas
             # make PRs in the next stage.
 
             if force_push
-              # TODO implement
-              raise "[ERROR] Force pushing with commit amend is not yet implemented."
+              puts "Force-pushing branch #{push_to_branch} (commit #{g.object('HEAD').sha}) to #{g.remotes.first}:#{repo_name}."
+              g.push(g.remotes.first, push_to_branch, force: true)
             else
-              puts "Pushing branch #{push_to_branch} (commit #{g.object('HEAD').sha}) to #{g.remotes.first}:#{repo_name}"
+              puts "Pushing branch #{push_to_branch} (commit #{g.object('HEAD').sha}) to #{g.remotes.first}:#{repo_name}."
               g.push(g.remotes.first, push_to_branch)
             end
           end
@@ -393,15 +392,15 @@ module Cimas
           end
 
           g = Git.open(repo_dir)
-          github_slug = git_remote_to_github_name(repo['remote'])
+          github_slug = git_remote_to_github_name(repo.remote)
 
-          dry_run("Opening GitHub PR: #{github_slug}, branch #{repo['branch']} <- #{branch}, message '#{message}'") do
-            puts "Opening GitHub PR: #{github_slug}, branch #{repo['branch']} <- #{branch}, message '#{message}'"
+          dry_run("Opening GitHub PR: #{github_slug}, branch #{repo.branch} <- #{branch}, message '#{message}'") do
+            puts "Opening GitHub PR: #{github_slug}, branch #{repo.branch} <- #{branch}, message '#{message}'"
 
             begin
               pr = github_client.create_pull_request(
                 github_slug,
-                repo['branch'],
+                repo.branch,
                 branch,
                 message,
                 "As title. \n\n _Generated by Cimas_."
@@ -421,6 +420,11 @@ module Cimas
               when /field: head\s+code: invalid/
                 puts "[WARNING] Branch #{branch} does not exist on #{github_slug}. Did you run `push`? Skipping."
                 next
+
+              when /message: No commits between/
+                puts "[WARNING] Target branch (#{repo.branch}) is on par with new branch (#{branch}). Skipping."
+                next
+
               else
                 raise e
               end

data/lib/cimas/repository.rb

@@ -0,0 +1,25 @@
+module Cimas
+  class Repository
+    attr_reader :name, :remote, :branch, :files
+
+    def initialize(name, attributes = {})
+      init_from_attributes(name, attributes)
+    end
+
+    def nil?
+      remote == nil && branch == nil
+    end
+
+    private
+
+    def init_from_attributes(name, attributes)
+      if attributes
+        @name = name
+
+        @remote = attributes.fetch("remote", nil)
+        @branch = attributes.fetch("branch", nil)
+        @files = attributes.fetch("files", nil)
+      end
+    end
+  end
+end

data/lib/cimas/version.rb

@@ -1,3 +1,3 @@
 module Cimas
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cimas
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: travis
@@ -110,11 +110,13 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - cimas.gemspec
 - exe/cimas
 - lib/cimas.rb
 - lib/cimas/cli/command.rb
+- lib/cimas/repository.rb
 - lib/cimas/version.rb
 homepage: https://github.com/metanorma/cimas
 licenses: