gvcsfx 0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: cc8f144e9c0c6026b678a273f83c5decd5addaeab7107c51cf135960ebdd59e8
+  data.tar.gz: '09bb7c786358bb9c9f7bdfcc3561a445bc2b2dcd786b9b0a86e74889edf7cfad'
+SHA512:
+  metadata.gz: 372e845c794cdbae4cca7d448192c59b3e1f7c22206d01e8c55213377303889355ba916e09232ba3ba602649d3c7f87784b7e2744b06f623dae2ad25cde7d3eb
+  data.tar.gz: b72b982aae34765f09539d834384ad3ad5773e7717cafba5c120697b8b443429105b41de83c719035b1d84bb8668a577db9bda36502c52c79196cc374d5e0352

data/.gitignore

@@ -0,0 +1,6 @@
+*.log
+Gemfile.lock
+
+fx/.jrubyfx_cache/
+gvcsfx.jar
+gvcsfx-0.3.jar

data/Gemfile

@@ -0,0 +1,24 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+source "https://rubygems.org"
+
+gem 'tlogger', '~> 0.21'
+gem 'jrubyfx'
+gem 'toolrack', '~> 0.4'
+
+gem 'gvcs', '~> 0.1'
+gem 'git_cli', '~> 0.1'

data/README.md

@@ -0,0 +1,71 @@
+
+Generic Version Control System - JavaFX as GUI
+==============================================
+
+Version Control System (VCS) is a fantastic tool for developer to work on the same team. Changes between each developers can be independently tested and further integrates into complete system.
+
+GIT has been the common and well accepted tool for this purpose, but it might have few traps for new comer, especially when code is conflicted and merged required. It is a daunting task for new comer sometimes. 
+
+GVCSFx trying to provide a more natural workflow based on intend of the developer instead of independent advanced function of the GIT. The GUI trying to suggest a least resistance road to achieve an objective. 
+
+For example when developer is developing on development branch and there is an urgent need to switch to a branch. Git suggested command 'stash' to be used but stash is easy however restore of stash is not, especially when there is a conflict on the file that is in development compare to the one already in Git. You will know if you have been bitten by this beast.
+
+Hence the opinioned way to restore to stash is to a new branch so that a new development branch is automatically created for changes that is yet to be committed and developer can now in peace of mind know the changes shall be in new branch later and the normal merge workflow between two branches is streamlined.
+
+Other features includes:
+* Workspace management
+  * Allow git workspaces tie to particular project. Single project might have multiple different git workspaces
+  * Filter of project and only focus on the registered workspaces under a particular project
+  * Remove workspace and empty project (via 'Delete' key or context menu)
+* Commit workflow
+  * No need separate 'add' command. Any file selected on the table view shall be added automatically before commit and rollback when commit failed
+  * Double click to show diff of the file compare to already in version control
+  * Right-click Context Menu
+    * Add extension/files into .gitignore
+    * Revert changes of particular files from HEAD
+    * Take the file out from version control (wrongly check in)
+  * Stash existing changes and restore the stash (at branch tab) into new branch instead of the original branch
+* Ignore rules (.gitignore)
+  * Text editor free editing of the rules
+* Branches
+  * Create new branch
+  * Merge branch with current branch (context menu)
+  * Delete branch (context menu)
+* Tag
+  * Checkout tag into new branch 
+  * Double click show tag info
+  * Arrange tag by creation date
+  * Show tag created on when and by who
+  * Checkout tag into new branch (context menu)
+  * Delete of tag (via keyboard 'Delete' key)
+* Logs
+  * Show date, subject and committer
+  * Double click on log show details
+  * Copy subject (copy the commit message so that can paste into commit message in the commit screen) (context menu)
+* Repository
+  * Add/remove repository (Delete via keyboard 'Delete' key)
+  * Push, optional together with tag to the repository
+  * Pull from the repository
+
+
+To be implemented
+=================
+
+* Global / Local configurations (httpVerify, author name, email etc)
+* View pending changes compare to remote server - allow cherry-pick operation
+* Conflicted files and status
+* Sort by date/committer on logs
+
+
+Development
+===========
+
+System is developed on
+* jruby-9.2.9.0 (2.5.7)
+* Oracle JDK 1.8.0\_261 
+
+
+
+
+
+

data/bin/gvcsfx

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+
+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)"
+else
+  require File.join(File.dirname(__FILE__),"gvcsfx.rb")
+end
+
+
+
+

data/bin/gvcsfx.rb

@@ -0,0 +1,97 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'jrubyfx'
+
+require_relative "../lib/version"
+
+fxml_root File.join(File.dirname(__FILE__),"..","fx")
+
+require_relative '../handlers/main_win_controller'
+require_relative '../handlers/tray'
+require_relative '../handlers/float_win_controller'
+
+# fxml_root first param = path when it is not in jar
+# 2nd param = path when it is in jar
+fxml_root File.join(File.dirname(__FILE__),"..",'fx'), 'gvcsfx/fx'
+
+module GvcsFx
+  class MainWin < JRubyFX::Application
+    include GvcsFx::Tray
+
+    attr_reader :stage
+    def start(stage)
+      
+      @stage = stage
+      @stage.title = "GVCS Main"
+      #@stage.always_on_top = true
+      #@stage.init_style = javafx.stage.StageStyle::UNDECORATED
+      #javafx.application.Platform.implicit_exit = false
+
+      # temporary disable for direct testing
+      #with(stage, title: "G-VCS Float") do
+      #  fxml FloatWinController
+      #  show
+      #end
+
+      # this works!
+      # But no in jar setting
+      MainWinController.load_into(@stage)
+      # This also works!
+      # But also no in jar setting...
+      # but this is more promising then the previous setup
+      #MainWinController.load_into(@stage, { filename: "main.fxml" })
+      @stage.show
+
+      # this is correct can show tray 
+      # but hide/show javafx stage doesn't work
+      #javax.swing.SwingUtilities.invokeLater do
+      #  start_tray(self)
+      #end
+
+    end # start
+
+    def show_stage
+      javafx.application.Platform.run_later do
+        puts "insite run_later #{@stage}"
+        if not @stage.nil?
+          @stage.show
+          @stage.toFront
+        end
+      end
+    end
+
+    def hide_stage
+      javafx.application.Platform.run_later do
+        @stage.hide
+      end
+    end
+
+  end
+end
+
+GvcsFx::MainWin.launch
+
+#if $0 == __FILE__
+  #puts "Launching"
+
+#GvcsFx::MainWin.launch
+  ## put swing code in its own event loop or the right click menu and the icon itself won't show 
+  #event_thread = nil
+  #javax.swing.SwingUtilities.invokeAndWait { event_thread = java.lang.Thread.currentThread }
+  #event_thread.join
+#end
+

data/config/warble.rb

@@ -0,0 +1,212 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 
+# Warble config starts here
+#
+# Disable Rake-environment-task framework detection by uncommenting/setting to false
+# Warbler.framework_detection = false
+
+# Warbler web application assembly configuration file
+Warbler::Config.new do |config|
+  # Features: additional options controlling how the jar is built.
+  # Currently the following features are supported:
+  # - *gemjar*: package the gem repository in a jar file in WEB-INF/lib
+  # - *executable*: embed a web server and make the war executable
+  # - *runnable*: allows to run bin scripts e.g. `java -jar my.war -S rake -T`
+  # - *compiled*: compile .rb files to .class files
+  # config.features = %w(gemjar)
+	config.features = %w(gemjar)
+	
+  # Application directories to be included in the webapp.
+  # config.dirs = %w(app config db lib log script vendor tmp)
+	config.dirs = %w(bin config fx handlers lib res)
+
+  # Additional files/directories to include, above those in config.dirs
+  # config.includes = FileList["db"]
+	#config.includes = FileList["app.rb"]
+	#config.includes = FileList["license.txt"]
+  config.includes = FileList["fx/.jrubyfx_cache","fx/*.xml"]
+
+  # Additional files/directories to exclude
+  # config.excludes = FileList["lib/tasks/*"]
+
+  # Additional Java .jar files to include.  Note that if .jar files are placed
+  # in lib (and not otherwise excluded) then they need not be mentioned here.
+  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
+  # own versions if you directly set the value
+  # config.java_libs += FileList["lib/java/*.jar"]
+	#config.java_libs += FileList["lib/*.jar"]
+	config.java_libs += FileList["jars/*.jar"]
+
+  # Loose Java classes and miscellaneous files to be included.
+  # config.java_classes = FileList["target/classes/**.*"]
+
+  # One or more pathmaps defining how the java classes should be copied into
+  # the archive. The example pathmap below accompanies the java_classes
+  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
+  # for details of how to specify a pathmap.
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
+
+  # Bundler support is built-in. If Warbler finds a Gemfile in the
+  # project directory, it will be used to collect the gems to bundle
+  # in your application. If you wish to explicitly disable this
+  # functionality, uncomment here.
+  # config.bundler = false
+
+  # An array of Bundler groups to avoid including in the war file.
+  # Defaults to ["development", "test", "assets"].
+  # config.bundle_without = []
+
+  # Other gems to be included. If you don't use Bundler or a gemspec
+  # file, you need to tell Warbler which gems your application needs
+  # so that they can be packaged in the archive.
+  # For Rails applications, the Rails gems are included by default
+  # unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
+  # config.gems << "tzinfo"
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+	config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "4.2.5"
+
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # finer-grained control.
+  # config.gems << /^sinatra-/
+  # config.gems << Gem::Dependency.new("sinatra", "= 1.4.7")
+
+  # Include gem dependencies not mentioned specifically. Default is
+  # true, uncomment to turn off.
+  # config.gem_dependencies = false
+
+  # Array of regular expressions matching relative paths in gems to be
+  # excluded from the war. Defaults to empty, but you can set it like
+  # below, which excludes test files.
+  # config.gem_excludes = [/^(test|spec)\//]
+
+  # Pathmaps for controlling how application files are copied into the archive
+  # config.pathmaps.application = ["WEB-INF/%p"]
+
+  # Name of the archive (without the extension). Defaults to the basename
+  # of the project directory.
+  # config.jar_name = "mywar"
+	config.jar_name = "gvcsfx"
+
+  # File extension for the archive. Defaults to either 'jar' or 'war'.
+  config.jar_extension = "jar"
+
+  # Destionation for the created archive. Defaults to project's root directory.
+  # config.autodeploy_dir = "dist/"
+
+  # Name of the MANIFEST.MF template for the war file. Defaults to a simple
+  # MANIFEST.MF that contains the version of Warbler used to create the war file.
+  # config.manifest_file = "config/MANIFEST.MF"
+
+  # When using the 'compiled' feature and specified, only these Ruby
+  # files will be compiled. Default is to compile all \.rb files in
+  # the application.
+  # config.compiled_ruby_files = FileList['app/**/*.rb']
+
+  # Determines if ruby files in supporting gems will be compiled.
+  # Ignored unless compile feature is used.
+  # config.compile_gems = false
+  #config.compile_gems = true
+
+  # When set it specify the bytecode version for compiled class files
+  # config.bytecode_version = "1.6"
+
+  # When set to true, Warbler will override the value of ENV['GEM_HOME'] even it
+  # has already been set. When set to false it will use any existing value of
+  # GEM_HOME if it is set.
+  # config.override_gem_home = true
+
+  # Allows for specifing custom executables
+  # config.executable = ["rake", "bin/rake"]
+  #config.executable = ["gvcs_fx.rb"]
+	
+  # Sets default (prefixed) parameters for the executables
+  # config.executable_params = "do:something"
+
+  # If set to true, moves jar files into WEB-INF/lib. Prior to version 1.4.2 of Warbler this was done
+  # by default. But since 1.4.2 this config defaults to false. It may need to be set to true for
+  # web servers that do not explode the WAR file.
+  # Alternatively, this option can be set to a regular expression, which will
+  # act as a jar selector -- only jar files that match the pattern will be
+  # included in the archive.
+  # config.move_jars_to_webinf_lib = false
+
+  # === War files only below here ===
+
+  # Embedded webserver to use with the 'executable' feature. Currently supported
+  # webservers are:
+  # - *jetty* - Embedded Jetty from Eclipse
+  # config.webserver = 'jetty'
+
+  # Path to the pre-bundled gem directory inside the war file. Default
+  # is 'WEB-INF/gems'. Specify path if gems are already bundled
+  # before running Warbler. This also sets 'gem.path' inside web.xml.
+  # config.gem_path = "WEB-INF/vendor/bundler_gems"
+
+  # Files for WEB-INF directory (next to web.xml). This contains
+  # web.xml by default. If there is an .erb-File it will be processed
+  # with webxml-config. You may want to exclude this file via
+  # config.excludes.
+  # config.webinf_files += FileList["jboss-web.xml"]
+
+  # Files to be included in the root of the webapp.  Note that files in public
+  # will have the leading 'public/' part of the path stripped during staging.
+  # config.public_html = FileList["public/**/*", "doc/**/*"]
+
+  # Pathmaps for controlling how public HTML files are copied into the .war
+  # config.pathmaps.public_html = ["%{public/,}p"]
+
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+
+  # Public ROOT mapping, by default assets are copied into .war ROOT directory.
+  # config.public.root = ''
+
+  # Application booter to use, either :rack or :rails (autodetected by default)
+  # config.webxml.booter = :rails
+
+  # When using the :rack booter, "Rackup" script to use.
+  # - For 'rackup.path', the value points to the location of the rackup
+  # script in the web archive file. You need to make sure this file
+  # gets included in the war, possibly by adding it to config.includes
+  # or config.webinf_files above.
+  # - For 'rackup', the rackup script you provide as an inline string
+  #   is simply embedded in web.xml.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup.path = 'WEB-INF/hello.ru'
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
+  # Control the pool of Rails runtimes. Leaving unspecified means
+  # the pool will grow as needed to service requests. It is recommended
+  # that you fix these values when running a production server!
+  # If you're using threadsafe! mode, you probably don't want to set these values,
+  # since 1 runtime(default for threadsafe mode) will be enough.
+  # config.webxml.jruby.min.runtimes = 2
+  # config.webxml.jruby.max.runtimes = 4
+
+  # JNDI data source name
+  # config.webxml.jndi = 'jdbc/rails'
+end

data/fx/add_workspace.fxml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+Author: Chris Liaw <chrisliaw@antrapol.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+   <columnConstraints>
+      <ColumnConstraints hgrow="NEVER" maxWidth="-Infinity" minWidth="-Infinity" prefWidth="138.0" />
+      <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" />
+      <ColumnConstraints halignment="RIGHT" hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
+   </columnConstraints>
+   <rowConstraints>
+      <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="38.0" vgrow="NEVER" />
+      <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="38.0" vgrow="NEVER" />
+      <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="38.0" vgrow="NEVER" />
+      <RowConstraints maxHeight="-Infinity" minHeight="10.0" prefHeight="38.0" vgrow="NEVER" />
+   </rowConstraints>
+   <children>
+      <Label text="Workspace Path :">
+         <GridPane.margin>
+            <Insets left="3.0" />
+         </GridPane.margin>
+      </Label>
+      <Label fx:id="lblWorkspacePath" maxWidth="1.7976931348623157E308" text="&lt;path&gt;" wrapText="true" GridPane.columnIndex="1" />
+      <Button fx:id="butOpen" maxWidth="80.0" minWidth="80.0" mnemonicParsing="false" onAction="#butOpen_onAction" prefWidth="80.0" text="Open" GridPane.columnIndex="2">
+         <GridPane.margin>
+            <Insets right="5.0" />
+         </GridPane.margin>
+      </Button>
+      <Label text="Project :" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets left="3.0" />
+         </GridPane.margin>
+      </Label>
+      <ComboBox fx:id="cmbProject" maxWidth="1.7976931348623157E308" onAction="#cmbProj_onAction" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets right="5.0" />
+         </GridPane.margin>
+      </ComboBox>
+      <Label fx:id="lblNewProjName" text="New Project Name :" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets left="3.0" />
+         </GridPane.margin>
+      </Label>
+      <TextField fx:id="txtNewProjName" alignment="CENTER" onKeyReleased="#txtNewProjName_keyreleased" promptText="New Project Name" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets right="5.0" />
+         </GridPane.margin>
+      </TextField>
+      <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="3" GridPane.rowIndex="3">
+         <children>
+            <Button fx:id="butCreate" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#butCreate_onAction" prefWidth="80.0" text="Add">
+               <HBox.margin>
+                  <Insets right="5.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="butCancel" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#butCancel_onAction" prefWidth="80.0" text="Cancel">
+               <HBox.margin>
+                  <Insets right="5.0" />
+               </HBox.margin>
+            </Button>
+         </children>
+      </HBox>
+   </children>
+</GridPane>