cpee-model-management 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e0d7c0432ac96ec120c71aaf6fd7c5743c3399ebfd362c9c05c00c8ed31be2
-  data.tar.gz: fc22ce69a793d227476be4cd24e97a9c78d07dbe39f2a1fae6b12aa2ed6becc8
+  metadata.gz: 7bb70d01ebeeb6576722a378ec65514aa3118432737caf27d979c54ac3f4d73e
+  data.tar.gz: a69e9dc695583d226724283e2364c03a51978d488c8f718cb088708ec29468e8
 SHA512:
-  metadata.gz: 4b1cc4fabe2a895873ee7c3dd8d9ff5389306c22ae550885c71835a0b0605720603cee8f4da2129a3631f1f86efc0237be1482afc592f2776c7a0ab552eb6535
-  data.tar.gz: 0fbcf28cfa5d9d76b4eb0e09614390f9009f597152ad093e753ea4fbeac68386574a89c713544c205f19c225738edeaa86424dd15568291f112a6143e8b1b4f8
+  metadata.gz: 00aa163e4d9be3bc7e55d37116e33c4e99f47e3d8dad2a570d24648993c1a5016f79385c5fdbdf3cbd62783023441a93d073f3be40ebef2da75bdbd058b43917
+  data.tar.gz: 8ae2de3be4e438df6d5e0f99223d25bab844fc2663b79c42f465bada4bd9916eec111258eed21a2fda6e6c61db19d3b742f9087cb67cffcc230bb4d7c2073a45

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.1"
+  s.version          = "1.0.2"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

data/lib/cpee-model-management/implementation.rb

@@ -22,72 +22,134 @@ require 'riddl/server'
 require 'riddl/client'
 require 'riddl/protocols/utils'
 require 'fileutils'
+require 'pathname'
 
 module CPEE
   module ModelManagement
 
     SERVER = File.expand_path(File.join(__dir__,'moma.xml'))
 
+    def self::git_mv(models,old,new)
+      cdir = Dir.pwd
+      Dir.chdir(File.join(models,File.dirname(old)))
+      p1 = Pathname.new(File.dirname(old))
+      p2 = Pathname.new(File.dirname(new))
+      old = File.basename(old)
+      new = File.join(p1.relative_path_from(p1).to_s,File.basename(new))
+      `git mv "#{old}"                      "#{new}" 2>/dev/null`
+      `git rm -rf "#{old + '.active'}"      "#{new + '.active'}" 2>/dev/null`
+      `git rm -rf "#{old + '.active-uuid'}" "#{new + '.active-uuid'}" 2>/dev/null`
+      `git mv "#{old + '.author'}"          "#{new + '.author'}" 2>/dev/null`
+      `git mv "#{old + '.creator'}"         "#{new + '.creator'}" 2>/dev/null`
+      `git mv "#{old + '.stage'}"           "#{new + '.stage'}" 2>/dev/null`
+      Dir.chdir(cdir)
+    end
+    def self::git_rm(models,new)
+      cdir = Dir.pwd
+      Dir.chdir(File.join(models,File.dirname(new)))
+      new = File.basename(new)
+      `git rm -rf "#{new}" 2>/dev/null`
+       FileUtils.rm_rf(new)
+      `git rm -rf "#{new}.active" 2>/dev/null`
+      `git rm -rf "#{new}.active-uuid" 2>/dev/null`
+      `git rm -rf "#{new}.author" 2>/dev/null`
+      `git rm -rf "#{new}.creator" 2>/dev/null`
+      `git rm -rf "#{new}.stage" 2>/dev/null`
+      Dir.chdir(cdir)
+    end
+    def self::git_shift(models,new)
+      cdir = Dir.pwd
+      Dir.chdir(File.join(models,File.dirname(new)))
+      new = File.basename(new)
+      `git rm -rf "#{new}.active" 2>/dev/null`
+      `git rm -rf "#{new}.active-uuid" 2>/dev/null`
+      Dir.chdir(cdir)
+    end
+    def self::git_commit(models,new,author)
+      Process.fork do
+        exec 'ruby', File.join(__dir__,'commit.rb'), File.realpath(models), new, author
+      end
+    end
+    def self::fs_mv(models,old,new)
+      fname = File.join(models,old)
+      fnname = File.join(models,new)
+      FileUtils.mv(fname,fnname)
+      File.delete(fname + '.active',fnname + '.active') rescue nil
+      File.delete(fname + '.active-uuid',fnname + '.active-uuid') rescue nil
+      FileUtils.mv(fname + '.author',fnname + '.author') rescue nil
+      FileUtils.mv(fname + '.creator',fnname + '.creator') rescue nil
+      FileUtils.mv(fname + '.stage',fnname + '.stage') rescue nil
+    end
+    def self::fs_cp(models,old,new)
+      fname = File.join(models,old)
+      fnname = File.join(models,new)
+      FileUtils.cp(fname,fnname)
+      File.delete(fname + '.active',fnname + '.active') rescue nil
+      File.delete(fname + '.active-uuid',fnname + '.active-uuid') rescue nil
+      FileUtils.cp(fname + '.author',fnname + '.author') rescue nil
+      FileUtils.cp(fname + '.creator',fnname + '.creator') rescue nil
+      FileUtils.cp(fname + '.stage',fnname + '.stage') rescue nil
+    end
+    def self::fs_rm(models,new)
+      fname = File.join(models,new)
+      FileUtils.rm_rf(fname)
+      File.delete(fname + '.active') rescue nil
+      File.delete(fname + '.active-uuid') rescue nil
+      File.delete(fname + '.author') rescue nil
+      File.delete(fname + '.creator') rescue nil
+      File.delete(fname + '.stage') rescue nil
+    end
+    def self::fs_shift(models,new)
+      fname = File.join(models,new)
+      File.delete(fname + '.active') rescue nil
+      File.delete(fname + '.active-uuid') rescue nil
+      Dir.chdir(cdir)
+    end
+
+    def self::git_dir(models,file)
+      return nil if file.nil?
+      cdir = Dir.pwd
+      tdir = File.dirname(file)
+      Dir.chdir(File.join(models,tdir))
+      res = `git rev-parse --absolute-git-dir 2>/dev/null`
+      Dir.chdir(cdir)
+      res == '' ? nil : res
+    end
+
     def self::op(author,op,models,new,old=nil) #{{{
-      if File.exists?(File.join(models,'.git'))
-        cdir = Dir.pwd
-        Dir.chdir(models)
-        case op
-          when 'mv'
-            fname  = old
-            fnname = new
-            `git mv "#{fname}"                  "#{fnname}" 2>/dev/null`
-            `git rm -rf "#{fname + '.active'}"      "#{fnname + '.active'}" 2>/dev/null`
-            `git rm -rf "#{fname + '.active-uuid'}" "#{fnname + '.active-uuid'}" 2>/dev/null`
-            `git mv "#{fname + '.author'}"      "#{fnname + '.author'}" 2>/dev/null`
-            `git mv "#{fname + '.creator'}"     "#{fnname + '.creator'}" 2>/dev/null`
-            `git mv "#{fname + '.stage'}"       "#{fnname + '.stage'}" 2>/dev/null`
-          when 'rm'
-            fname = new
-            `git rm -rf "#{fname}" 2>/dev/null`
-             FileUtils.rm_rf(fname)
-            `git rm -rf "#{fname}.active" 2>/dev/null`
-            `git rm -rf "#{fname}.active-uuid" 2>/dev/null`
-            `git rm -rf "#{fname}.author" 2>/dev/null`
-            `git rm -rf "#{fname}.creator" 2>/dev/null`
-            `git rm -rf "#{fname}.stage" 2>/dev/null`
-          when 'shift'
-            fname = new
-            `git rm -rf "#{fname}.active" 2>/dev/null`
-            `git rm -rf "#{fname}.active-uuid" 2>/dev/null`
+      git_ndir = CPEE::ModelManagement::git_dir(models,new)
+      git_odir = CPEE::ModelManagement::git_dir(models,old)
+
+      if op == 'rm' && !git_ndir.nil?
+        git_rm models, new
+        git_commit models, new, author
+      elsif op == 'shift' && !git_ndir.nil?
+        git_shift models, new
+        git_commit models, new, author
+      elsif op == 'mv' && (!git_ndir.nil? || !git_odir.nil?)
+        if git_ndir == git_odir
+          git_mv models, old, new
+          git_commit models, new, author
+        elsif git_ndir != git_odir && !git_ndir.nil? && !git_odir.nil?
+          fs_cp models, old, new
+          git_rm models, old
+          git_commit models, old, author
+          git_commit models, new, author
+        elsif git_ndir != git_odir && git_ndir.nil?
+          fs_cp models, old, new
+          git_rm models, old
+          git_commit models, old, author
+        elsif git_ndir != git_odir && git_odir.nil?
+          fs_mv models, old, new
+          git_commit models, new, author
         end
-        fname = new
-        `git add "#{fname}" 2>/dev/null`
-        `git add "#{fname}.active" 2>/dev/null`
-        `git add "#{fname}.active-uuid" 2>/dev/null`
-        `git add "#{fname}.author" 2>/dev/null`
-        `git add "#{fname}.creator" 2>/dev/null`
-        `git add "#{fname}.stage" 2>/dev/null`
-        `git commit -m "#{author.gsub(/"/,"'")}"`
-        Dir.chdir(cdir)
+      elsif !git_ndir.nil?
+        git_commit models, new, author
       else
         case op
-          when 'mv'
-            fname = File.join(models,old)
-            fnname = File.join(models,new)
-            FileUtils.mv(fname,fnname)
-            File.delete(fname + '.active',fnname + '.active') rescue nil
-            File.delete(fname + '.active-uuid',fnname + '.active-uuid') rescue nil
-            FileUtils.mv(fname + '.author',fnname + '.author') rescue nil
-            FileUtils.mv(fname + '.creator',fnname + '.creator') rescue nil
-            FileUtils.mv(fname + '.stage',fnname + '.stage') rescue nil
-          when 'rm'
-            fname = File.join(models,new)
-            FileUtils.rm_rf(fname)
-            File.delete(fname + '.active') rescue nil
-            File.delete(fname + '.active-uuid') rescue nil
-            File.delete(fname + '.author') rescue nil
-            File.delete(fname + '.creator') rescue nil
-            File.delete(fname + '.stage') rescue nil
-          when 'shift'
-            fname = File.join(models,new)
-            File.delete(fname + '.active') rescue nil
-            File.delete(fname + '.active-uuid') rescue nil
+          when 'mv'; fs_mv(models,old,new)
+          when 'rm'; fs_rm(models,new)
+          when 'shift'; fs_shift(models,new)
         end
       end
     end #}}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl