safedb 0.5.1003 → 0.5.1005

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc97d7955c363f290d97994018b73806d1d465fdc8628bc299069bc0b4c2a43c
-  data.tar.gz: a0885f01b7fd396cf0860df2ba1383fb58222e62ebd298febf5c2aaa898ab071
+  metadata.gz: 637a4011eceb0a65ec0139c499d2494576ff9cfbdbd90c84907e9ed734753438
+  data.tar.gz: 48ac523f4c4f0d457bdd6a9ddfa1ca87e5c19ee1deb62c49bd14a7129cda9aae
 SHA512:
-  metadata.gz: 989bd998cc21841345b12f8bb2d3a74191203ce11d9895cd54e000fc597804988fe80cf76d0874a2d3c60e8e3a1d1bc1addf36f1db7a8c8edaef815b4c78091a
-  data.tar.gz: 35856adea81b13c0940c2ef8ce122fdfa19ebbdfad734a8eb6dad08f3e430c7b803c68afd54a68a88abb0b8ec91a74b2c58797c631233b8f1729ca484b54eb21
+  metadata.gz: c4064ea7b9b61840733de27aec02d99e2cd2fd9d60ad9b8b41b130a77cf0606a04c25229580b25c3bc5af472eab08727fbef4d33f0b13a970246091e64bc19ef
+  data.tar.gz: 30c16510557f03cdcfdf4f78cf3c64f7701cfd8ca0418a6af2a11ff517071c5e2bbfced54cd401a31aa058bb1b50ae214f5894d4978a0d34d5daa1061bc601ea

data/CONTRIBUTING.md

@@ -9,7 +9,7 @@ You can contriubute software, documentation, issues and even good ideas. Most co
 To contribute software you'll need to setup a development environment.
 
 ```
-sudo apt-get install --assume-yes ruby-full libicu-dev git
+sudo apt install --assume-yes ruby-full libicu-dev git
 sudo chown -R $USER:$USER /var/lib/gems
 sudo chown -R $USER:$USER /usr/local/bin
 sudo chown -R $USER:$USER /usr/local/lib

data/lib/cli.rb

@@ -205,19 +205,9 @@ class CLI < Thor
 
 
   # Description of the diff use case command from the point of view
-  # of either a refresh from master to branch, a commit from branch
-  # to master or a diff listing prophesying about both.
-  desc "diff", "master and branch diff with --commit (-i), --refresh (-o) or both."
-
-  # A commit is basically a copy-overwrite operation which does not finesse
-  # like the merging refresh does. The diff report illustrates that the master
-  # will essentially reflect the working branch's current state.
-  method_option :commit, :type => :boolean, :aliases => "-c"
-
-  # A refresh is effectively an incoming merge of the master's data
-  # structure into the working branch. With refreshs nothing ever gets
-  # deleted.
-  method_option :refresh, :type => :boolean, :aliases => "-r"
+  # of either a refresh from master to branch, or a commit from branch
+  # to master, depending on what is permissible given the state.
+  desc "diff", "master and branch diff that indicates whether a commit or refresh can happen."
 
   # The <b>diff use case</b> spells out the key differences between the safe book
   # on the master line the one on the current working branch.
@@ -225,11 +215,8 @@ class CLI < Thor
   # By default when conflicts occur, priority is given to the current working branch.
   # No parameters are required to perform a diff.
   def diff
-    log.info(x) { "prophesy list of refresh and/or commit actions. CLI options are #{options.to_s()}" }
-    diff_uc = SafeDb::Diff.new()
-    diff_uc.commit = true if options[ :commit ]
-    diff_uc.refresh = true if options[ :refresh ]
-    diff_uc.flow()
+    log.info(x) { "prophesy list of either refresh or commit actions." }
+    SafeDb::Diff.new().flow()
   end
 
 

data/lib/controller/admin/diff.rb

@@ -35,34 +35,28 @@ module SafeDb
   #
   class Diff < Controller
 
-    # The commit and refresh boolean flags that signal which way round to do the diff
-    attr_writer :commit, :refresh
-
     # The <b>diff use case</b> compares the database state of the branch with
     # that of the master and displays the results without masking sensitive
     # credentials.
     def execute
 
-      print_both = @commit.nil?() && @refresh.nil?()
-      print_commit = !@commit.nil?() || print_both
-      print_refresh = !@refresh.nil?() || print_both
-
-      puts ""
-      puts " == Birth Day := #{@book.init_time()}\n"
-      puts " == Book Name := #{@book.book_name()} [#{@book.book_id}]\n"
-      puts " == Book Mark := #{@book.get_open_chapter_name()}/#{@book.get_open_verse_name()}\n" if @book.is_opened?()
-      puts ""
-
       master_data = @book.to_master_data()
       branch_data = @book.to_branch_data()
 
-      StateInspect.refresh_prophecies( master_data, branch_data ) if print_refresh
-      StateInspect.commit_prophecies( master_data, branch_data ) if print_commit
-
       puts ""
       puts "   master has #{master_data.length()} chapters, and #{@book.get_master_verse_count()} verses.\n"
       puts "   branch has #{branch_data.length()} chapters, and #{@book.get_branch_verse_count()} verses.\n"
       puts ""
+      puts "  You can commit to (or refresh from) the master branch." if @book.can_commit?()
+      puts "  List of commit differences" if @book.can_commit?()
+      puts "  You must refresh from the master branch." unless @book.can_commit?()
+      puts "  List of refresh differences" unless @book.can_commit?()
+      puts ""
+
+      StateInspect.refresh_prophecies( master_data, branch_data ) unless @book.can_commit?()
+      StateInspect.commit_prophecies( master_data, branch_data ) if @book.can_commit?()
+
+      puts ""
 
     end
 

data/lib/model/state.inspect.rb

@@ -95,13 +95,7 @@ module SafeDb
     # @param master_data [Hash] data structure from the master line of the book
     # @param branch_data [Hash] data structure from the current working branch
     def self.refresh_prophecies( master_data, branch_data )
-
-      puts " = safe diff --refresh"
-      puts " = incoming from master to working branch"
-      puts ""
-
       data_differences( master_data, branch_data )
-
     end
 
 
@@ -122,14 +116,8 @@ module SafeDb
     # @param master_data [Hash] data structure from the master line of the book
     # @param branch_data [Hash] data structure from the current working branch
     def self.commit_prophecies( master_data, branch_data )
-
-      puts " = safe diff --commit"
-      puts " = outgoing from working branch to master"
-      puts ""
-
       data_differences( branch_data, master_data )
       drop_differences( master_data, branch_data )
-
     end
 
 
@@ -204,31 +192,31 @@ module SafeDb
 
 
     def self.print_chapter_2b_added( fq_chap_name )
-      puts " + Chapter 2b added -> #{fq_chap_name}"
+      puts "     + Chapter 2b added -> #{fq_chap_name}"
     end
 
     def self.print_verse_2_be_added( fq_vers_name )
-      puts " + Verse 2 be added -> #{fq_vers_name}"
+      puts "     + Verse 2 be added -> #{fq_vers_name}"
     end
 
     def self.print_line_to_be_added( fq_line_name )
-      puts " + Line to be added -> #{fq_line_name}"
+      puts "     + Line to be added -> #{fq_line_name}"
     end
 
     def self.print_line_will_change( fq_line_name )
-      puts " + Line will change -> #{fq_line_name}"
+      puts "     + Line will change -> #{fq_line_name}"
     end
 
     def self.print_chapter_2b_removed( fq_chap_name )
-      puts " - Chapter 2b removed -> #{fq_chap_name}"
+      puts "     - Chapter 2b removed -> #{fq_chap_name}"
     end
 
     def self.print_verse_2_be_removed( fq_vers_name )
-      puts " - Verse 2 be removed -> #{fq_vers_name}"
+      puts "     - Verse 2 be removed -> #{fq_vers_name}"
     end
 
     def self.print_line_to_be_removed( fq_line_name )
-      puts " - Line to be removed -> #{fq_line_name}"
+      puts "     - Line to be removed -> #{fq_line_name}"
     end
 
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SafeDb
-  VERSION = "0.5.1003"
+  VERSION = "0.5.1005"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safedb
 version: !ruby/object:Gem::Version
-  version: 0.5.1003
+  version: 0.5.1005
 platform: ruby
 authors:
 - Apollo Akora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt