gvcsfx 0.5.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6369ef6276b5fe3056d998870df86a3e6287738bdd59c79e0c60f2085a82716a
-  data.tar.gz: d9ea8e3ade3d700ea3111febd00b700e755e4f8e1966d9b1f08cb45d12304732
+  metadata.gz: 2f984429b6b074fd62c4713934e8190ed689e558b27e7940e2fb2123615d9fa5
+  data.tar.gz: 944311d718903fcdb54fbe0ce0dd4f4a023955a33d106306cbd6b78a1a1ec290
 SHA512:
-  metadata.gz: 3961b8dbb580e43449bfce3137a4a1945fb24e9791109c95976a184dcef1517cb1e748ce29f69ec48ba0b96ed26985e28490f6c9e619b691e09f61dc91144107
-  data.tar.gz: ee05aee7df0644b55f72b19f6191de68a12ea32d5ae055b82b42af9d2439ff84adca121e934cf4f38579a404a17dd20cd5b013186b6a995a6a42117e1c8086c2
+  metadata.gz: 5e6557ee9c91293fd1fec7a19a94d6f03fc59291d4647b06aa85ca1aa02e4e07be66799858251979c20ee76aad3f3fb8cfc970c0f1252dd557cf2ff96fba7185
+  data.tar.gz: 1ea67c3397e00acbdd5961e220c419c63c84e2471666854677305e86e5ff50590b461b3e8ec1ba2d8e24cb152d95ea6b0cf6fcc2a5491bafa88e8d3e1a9b468f

data/Gemfile

@@ -18,6 +18,9 @@ source "https://rubygems.org"
 
 gemspec
 
+#gem 'git_cli', path: '../git/git_cli'
+
+#gem 'jrubyfx-openjfx.patch', path: '/mnt/Vault/08.Dev/01.Workspaces/jrubyfx_patches/jrubyfx'
 #gem 'tlogger', '~> 0.21'
 #gem 'jrubyfx'
 #gem 'toolrack', '~> 0.4'

data/bin/gvcsfx

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'bundler'
+#require 'bundler'
 
 if (RUBY_PLATFORM =~ /java/) == nil
   STDERR.puts "GvcsFX required JRuby to be installed. Please installed the JRuby  and try again (switch to jruby first before run gvcsfx if you're using rvm)"

data/fx/main.fxml

@@ -127,8 +127,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                           <GridPane layoutX="240.0" layoutY="115.0" maxWidth="1.7976931348623157E308" AnchorPane.bottomAnchor="8.0" AnchorPane.leftAnchor="8.0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0">
                                             <columnConstraints>
                                               <ColumnConstraints hgrow="NEVER" maxWidth="215.0" />
-                                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="684.0" />
-                                                <ColumnConstraints hgrow="SOMETIMES" maxWidth="501.0" minWidth="10.0" prefWidth="209.0" />
+                                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="642.0" />
+                                                <ColumnConstraints hgrow="NEVER" maxWidth="288.0" minWidth="288.0" prefWidth="288.0" />
                                             </columnConstraints>
                                             <rowConstraints>
                                               <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="28.0" vgrow="NEVER" />
@@ -153,10 +153,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                                       <Insets bottom="5.0" top="5.0" />
                                                    </GridPane.margin>
                                                 </TableView>
-                                                <ComboBox fx:id="cmbCommitMsg" editable="true" maxWidth="1.7976931348623157E308" onKeyTyped="#is_cmbCommit_enter" promptText="Commit message" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
-                                                <Button fx:id="butCommit" defaultButton="true" maxWidth="80.0" minWidth="80.0" mnemonicParsing="false" onAction="#vcs_commit" prefWidth="80.0" text="Commit" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
-                                                <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="2">
+                                                <ComboBox fx:id="cmbCommitMsg" editable="true" maxWidth="1.7976931348623157E308" onKeyPressed="#is_cmbCommit_enter" promptText="Commit message" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+                                                <Button fx:id="butCommit" maxWidth="80.0" minWidth="80.0" mnemonicParsing="false" onAction="#vcs_commit" prefWidth="80.0" text="Commit" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+                                                <HBox alignment="CENTER_RIGHT" prefHeight="28.0" prefWidth="332.0" GridPane.columnIndex="2">
                                                    <children>
+                                                      <TextField fx:id="txtStateFileNmFilter" alignment="CENTER" onKeyPressed="#name_filter_keypressed" promptText="File name filter" HBox.hgrow="ALWAYS">
+                                                         <HBox.margin>
+                                                            <Insets left="3.0" right="3.0" />
+                                                         </HBox.margin>
+                                                      </TextField>
                                                       <Button fx:id="butRefreshChanges" alignment="CENTER" maxWidth="80.0" minWidth="80.0" mnemonicParsing="false" onAction="#refresh_vcs_status" prefWidth="80.0" text="Refresh">
                                                          <HBox.margin>
                                                             <Insets />
@@ -457,7 +462,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                               <RowConstraints minHeight="10.0" prefHeight="38.0" vgrow="SOMETIMES" />
                                             </rowConstraints>
                                              <children>
-                                                <TitledPane collapsible="false" maxHeight="1.7976931348623157E308" minHeight="-Infinity" text="Configurations" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
+                                                <TitledPane collapsible="false" maxHeight="1.7976931348623157E308" text="Configurations" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
                                                    <content>
                                                       <TabPane tabMinWidth="80.0">
                                                          <tabs>

data/gvcsfx.gemspec

@@ -27,12 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables   = "gvcsfx"
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'tlogger', '>= 0.21'
+  spec.add_dependency 'bundler', '~> 2.2.4'
+
+  spec.add_dependency 'tlogger' #, '>= 0.21'
   spec.add_dependency 'jrubyfx-openjfx.patch', '1.2.0.1'
-  spec.add_dependency 'toolrack', '~> 0.4'
-  spec.add_dependency 'gvcs', '~> 0.1.0'
-  spec.add_dependency 'git_cli', '~> 0.6.0'
+  spec.add_dependency 'toolrack' #, '>= 0.5.0'
+  spec.add_dependency 'gvcs' #, '>= 0.1.0'
+  spec.add_dependency 'git_cli', '>= 0.8.0'
 
-  spec.add_development_dependency 'devops_helper', '~> 0.2.0'
+  spec.add_development_dependency 'devops_helper' #, '>= 0.3.1'
   
 end

data/handlers/tab_state.rb

@@ -33,28 +33,33 @@ module GvcsFx
     end
     class ModifiedFile < VcsElement
       def initialize(path, ftype)
-        super("M",path, ftype)
+        super("Changed",path, ftype)
       end
     end
     class ConflictedFile < VcsElement
       def initialize(path, ftype)
-        super("C",path, ftype)
+        super("Conflicted",path, ftype)
       end
     end
     class NewFile < VcsElement
       def initialize(path, ftype)
-        super("N",path, ftype)
+        super("New",path, ftype)
       end
     end
     class DeletedFile < VcsElement
       def initialize(path, ftype)
-        super("D",path, ftype)
+        super("Deleted",path, ftype)
+      end
+    end
+    class StagedFile < VcsElement
+      def initialize(path, ftype)
+        super("Staged",path, ftype)
       end
     end
     #############
 
     def init_tab_state
-      @tblChanges.placeholder = javafx.scene.control.Label.new("Changeset is empty. Please select a workspace or the selected workspace has no changes ")
+      @tblChanges.placeholder = javafx.scene.control.Label.new("Changeset is empty. Please select a workspace, the selected workspace has no changes or changes have been filtered out.")
 
       @tblChanges.columns.clear
       @tblChanges.column_resize_policy = javafx.scene.control.TableView::CONSTRAINED_RESIZE_POLICY
@@ -116,15 +121,20 @@ module GvcsFx
     # hooked to but Commit on action
     def vcs_commit(evt)
       sel = @tblChanges.selection_model.selected_items
-      msg = @cmbCommitMsg.value
+      # for editable combobox, value comes AFTER the enter key is pressed.
+      # But this might have empty value since it is processed BEFORE enter key is detected
+      # by the underlying system
+      #msg = @cmbCommitMsg.value
+      msg = @cmbCommitMsg.editor.text
       if sel.length == 0
         fx_alert_error "Cannot commit on empty changes selection. Please select at least a file from the table above.", "No Files Selected", main_stage
       elsif (msg.nil? or msg.empty?)
         fx_alert_error "Commit message must be present.", "Empty Commit Message", main_stage
       else
         commit_changes(sel, msg)
+        # apparently the combobox has its own history
         if not @msgHistory.include?(msg)
-          @cmbCommitMsg.items.add(msg)
+          #@cmbCommitMsg.items.add(msg)
           @msgHistory << msg
         end
         refresh_tab_state
@@ -140,11 +150,32 @@ module GvcsFx
         cst, cflt_dirs, cflt_files = @selWs.conflicted_files
         nst, news_dirs, news_files = @selWs.new_files
         dst, dels_dirs, dels_files = @selWs.deleted_files
+        sst, staged_dirs, staged_files = @selWs.staged_files
+
+        filter = @txtStateFileNmFilter.text
+
+        if not_empty?(filter)
+          mods_dirs.delete_if { |e| (e =~ /#{filter}/) == nil }
+          mods_files.delete_if { |e| (e =~ /#{filter}/) == nil }
+
+          cflt_dirs.delete_if { |e| (e =~ /#{filter}/) == nil }
+          cflt_files.delete_if { |e| (e =~ /#{filter}/) == nil }
+
+          news_dirs.delete_if { |e| (e =~ /#{filter}/) == nil }
+          news_files.delete_if { |e| (e =~ /#{filter}/) == nil }
+
+          dels_dirs.delete_if { |e| (e =~ /#{filter}/) == nil }
+          dels_files.delete_if { |e| (e =~ /#{filter}/) == nil }
+
+          staged_dirs.delete_if { |e| (e =~ /#{filter}/) == nil }
+          staged_files.delete_if { |e| (e =~ /#{filter}/) == nil }
+        end
 
         data = []
         mods_dirs.each do |f|
           data << ModifiedFile.new(f,:dir)
         end
+
         mods_files.each do |f|
           data << ModifiedFile.new(f,:file)
         end
@@ -162,6 +193,7 @@ module GvcsFx
         news_files.each do |f|
           data << NewFile.new(f,:file)
         end
+
         dels_dirs.each do |f|
           data << DeletedFile.new(f,:dir)
         end
@@ -169,6 +201,13 @@ module GvcsFx
           data << DeletedFile.new(f,:file)
         end
 
+        staged_dirs.each do |f|
+          data << StagedFile.new(f,:dir)
+        end
+        staged_files.each do |f|
+          data << StagedFile.new(f,:file)
+        end
+
         bst, currBranch = @selWs.current_branch
         if bst
           @lblCurrBranch.text = currBranch
@@ -187,6 +226,7 @@ module GvcsFx
       refresh_vcs_status(nil)
       @cmbCommitMsg.selection_model.clear_selection
       @cmbCommitMsg.value = nil
+      @cmbCommitMsg.editor.text = ""
     end
 
     # hooked to on_key_typed
@@ -196,17 +236,25 @@ module GvcsFx
       end
     end
 
+    def name_filter_keypressed(evt)
+      if (not evt.nil?) and evt.code == javafx.scene.input.KeyCode::ENTER
+        refresh_tab_state
+      end
+    end
+
     # hooked to the button "not ready to commit just yet..."
     def stash_changes(evt)
       mst, mods_dirs, mods_files = @selWs.modified_files
       cst, cflt_dirs, cflt_files = @selWs.conflicted_files
       nst, news_dirs, news_files = @selWs.new_files
       dst, dels_dirs, dels_files = @selWs.deleted_files
+      sst, staged_dirs, staged_files = @selWs.staged_files
 
       if mods_dirs.length > 0 or mods_files.length > 0 \
           or cflt_dirs.length > 0 or cflt_files.length > 0 \
           or news_dirs.length > 0 or news_files.length > 0 \
-          or dels_dirs.length > 0 or dels_files.length > 0
+          or dels_dirs.length > 0 or dels_files.length > 0 \
+          or staged_dirs.length > 0 or staged_files.length > 0
 
         msg = []
         msg << "System detected there are existing uncommitted changes in the current workspace:\n"
@@ -218,6 +266,8 @@ module GvcsFx
         msg << "\tDeleted file(s) : \t\t#{dels_files.length}\n"
         msg << "\tNew folder(s) : \t\t#{news_dirs.length}\n"
         msg << "\tNew file(s) : \t\t\t#{news_files.length}\n"
+        msg << "\tStaged folder(s) : \t\t#{staged_dirs.length}\n"
+        msg << "\tStaged file(s) : \t\t\t#{staged_files.length}\n"
 
         st, name = fx_alert_input("Temporary Save Changes To Branch",msg.join, "Please give a descriptive name of this temporary changes.\nIt is recommended but not mandatory")
         if st

data/lib/version.rb

@@ -17,5 +17,5 @@
 
 
 module GvcsFx
-  VERSION = "0.5.2"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,21 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: gvcsfx
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Chris
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+  name: bundler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   name: tlogger
   prerelease: false
   type: :runtime
@@ -23,7 +37,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -41,59 +55,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   name: toolrack
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   name: gvcs
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   name: git_cli
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   name: devops_helper
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 description: Simple and effective VCS workflow management
 email:
 - chrisliaw@antrapol.com