gluby-tk 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df814d914256418a1371666ceccd4e4df8fb5317
-  data.tar.gz: 46f945053c302840b0ed4d3815ecf82712b4e733
+  metadata.gz: 7230842b7ddad5638110b30934fe18254ebac815
+  data.tar.gz: 4ecfb3baa8ad8596ff88ef6c0515bf5aaed5f502
 SHA512:
-  metadata.gz: bff13c27d15fe3bbf8f35dd5a1fbf217e7083d76d009964c1e7c7a4ececf775ff1d263a2ca58616de41ca44c625550994086b5e615d31b0819fcc8fe913d757d
-  data.tar.gz: 61b20596daf636c1c709d4a0d511cdb8bded7184bb88bac869388a256e9b05c9e9d6aff7b026d6576dd866a452987a1c24d8d920ff0e3fa08aafc5245f270af6
+  metadata.gz: 5849f6647db95aaa2b01bf4625627a6086477f0d6bae418e42d3a5f5a62dc44fab07974eeec2ef12f8bf17d30a8ebbfa976a990c181128f14e5cca321e5d7560
+  data.tar.gz: 3c50b955da1765736c518ffbbba0820aeffb846a5b0b1609c118b6abf0ba21cb273cc33da2cf186a8d3c23a79cdc225b4965cf0b100788d32dfd862f9d2ec22f

data/bin/gluby

@@ -19,18 +19,27 @@ require "wannabe_bool"
 #   GlubyTK.hi
 # end
 
-puts "No command specified - exiting now..." and exit(0) if ARGV.empty?
+GlubyTK.gputs "No command specified - exiting now..." and exit(0) if ARGV.empty?
 
 if ARGV[0] == "new"
   if ARGV[1].nil? || ARGV[1].strip.empty?
-    puts "No app name specified - exiting now..."
+    GlubyTK.gputs "No app name specified - exiting now..."
     exit(1)
   else
-    puts "Creating #{ARGV[1]}..."
+    GlubyTK.gputs "Creating #{ARGV[1]}..."
     GlubyTK::Generator.create(ARGV[1])
   end
 elsif ARGV[0] == "rebuild"
-  GlubyTK::Generator.rebuild(nil, !ARGV[1].nil? ? ARGV[1].to_b : false)
+  exit(1) unless GlubyTK::Generator.is_glubytk_directory?
+  GlubyTK.gputs "Rebuilding..."
+  GlubyTK::Generator.rebuild
+elsif ARGV[0] == "start"
+  exit(1) unless GlubyTK::Generator.is_glubytk_directory?
+  GlubyTK.gputs "Starting #{GlubyTK::Generator.current_app_name}..."
+  system "ruby main.rb &"
+elsif ARGV[0] == 'listen'
+  exit(1) unless GlubyTK::Generator.is_glubytk_directory?
+  GlubyTK::Listener.new
 end
 
 exit(0)

data/lib/gluby-tk.rb

@@ -1,6 +1,8 @@
+require "core_ext/string"
 require "gluby-tk/version"
+require "gluby-tk/logger"
 require "gluby-tk/generator"
-require "core_ext/string"
+require "gluby-tk/listener"
 
 module GlubyTK
 

data/lib/gluby-tk/generator.rb

@@ -1,7 +1,7 @@
 require 'nokogiri'
-require 'pp'
 
 module GlubyTK
+
   class Generator
     DIRECTORIES = [
       "assets",
@@ -12,7 +12,8 @@ module GlubyTK
     ]
 
     TEMPLATES = [
-      {:name => "main.rb", :path => ""},
+      {:name => "main.rb", :path => nil},
+      {:name => "Gemfile", :path => nil},
       {:name => "includes.rb", :path => "src"},
       {:name => "application.rb", :path => "src"},
       {:name => "ApplicationWindow.glade", :path => "interface"}
@@ -20,7 +21,7 @@ module GlubyTK
 
     def self.create app_name
       if File.exist?(app_name)
-        puts "#{app_name} already exists!"
+        GlubyTK.gputs "#{app_name} already exists!"
         exit(1)
       end
 
@@ -28,9 +29,8 @@ module GlubyTK
 
       module_name = "#{app_name.underscore}"
 
-      app_id = module_name.humanize.downcase
-
       # Create root directory
+      GlubyTK.gputs "Creating new project directory..."
       Dir.mkdir "#{Dir.pwd}/#{app_name}"
 
       # Create gluby-tkrc file
@@ -40,36 +40,40 @@ module GlubyTK
 
       # Create sub-directories
       DIRECTORIES.each do |dir|
+        GlubyTK.gputs "Creating directory: #{dir}..."
         Dir.mkdir "#{root}/#{dir}"
       end
 
       # Generate files from templates      
       TEMPLATES.each do |template|
-        File.open("#{root}/#{template[:path]}/#{template[:name]}", "w+") { |file|
-          file.write(get_template_contents("#{template[:name]}.template").gsub("gluby-tk_app_id", app_id))
+        template_dest_file = "#{root}/#{template[:path].nil? ? "" : template[:path] + "/"}#{template[:name]}"
+        GlubyTK.gputs "Creating #{template_dest_file}"
+        File.open(template_dest_file, "w+") { |file|
+          file.write(get_template_contents("#{template[:name]}.template").gsub("gluby-tk_app_id", module_name))
         }
       end
       
-      rebuild(root, true)
+      rebuild(root)
+      GlubyTK.gputs "Finished creating #{module_name}"
+      GlubyTK.gputs "Done!"
     end
 
-    def self.rebuild(root = nil, generate_ruby_classes = false)
-      unless is_glubytk_directory?(root)
-        puts "No GlubyTK project detected. Please make sure you are in the right directory"
-        exit(1)
-      end
-
+    def self.rebuild(root = nil)
+      GlubyTK.gputs "Constructing gresource file..."
       root = root || Dir.pwd
 
       interface_files = Dir["#{root}/interface/*.glade"]
+      
       gresource_file_contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       gresource_file_contents += "<gresources>\n"
+      
       interface_files.each { |filename|
         gresource_file_contents += "<gresource prefix=\"/app/#{current_app_name(root)}\">"
         gresource_file_contents += "<file preprocess=\"xml-stripblanks\">#{File.basename(filename)}</file>"
         gresource_file_contents += "</gresource>"
-        generate_ruby_class_for_document(File.basename(filename), File.read(filename), root, generate_ruby_classes)
+        generate_ruby_class_for_document(File.basename(filename), File.read(filename), root)
       }
+      
       gresource_file_contents += "</gresources>\n"
 
       File.open("#{root}/interface/interface.gresource.xml", "w+") { |file|
@@ -77,7 +81,7 @@ module GlubyTK
       }
     end
 
-    def self.generate_ruby_class_for_document(file_name, file_contents, root, generate_ruby_classes)
+    def self.generate_ruby_class_for_document(file_name, file_contents, root)
       doc = Nokogiri::XML(file_contents)
       
       if doc.css("template").first.nil?
@@ -94,6 +98,8 @@ module GlubyTK
 
       base_file_name = "#{file_name.gsub(File.extname(file_name), "").underscore}"
 
+      GlubyTK.gputs "Constructing #{base_file_name} Ruby class..."
+
       gluby_file_dir = "#{root}/src/gluby"
       gluby_file_path = "#{gluby_file_dir}/gluby_#{base_file_name}.rb"
       gluby_class_file_contents = [
@@ -109,20 +115,24 @@ module GlubyTK
       ].join("\n")
 
       File.open(gluby_file_path, "w+") { |file|
+        GlubyTK.gputs "Writing #{gluby_file_path}..."
         file.write gluby_class_file_contents
       }
 
-      if generate_ruby_classes
-        file_path = "#{root}/src/#{base_file_name}.rb"
+      # TODO: Need to ensure that the user-facing class (not the gluby_class_name) reflects any updates such as root class name change etc.
+      file_path = "#{root}/src/#{base_file_name}.rb"
+      if !File.exist?(file_path)
+        GlubyTK.gputs "#{file_path} did not exist. Creating..."
         class_file_contents = [
           "class #{class_name.underscore.humanize}",
           "\tdef initialize(args = nil)",
           "\t\tsuper(args)",
           "\tend",
-          "end",
+          "end"
         ].join("\n")
 
         File.open(file_path, "w+") { |file|
+          GlubyTK.gputs "Writing #{file_path}..."
           file.write class_file_contents
         }
       end
@@ -131,6 +141,8 @@ module GlubyTK
         contents = file.read
         g_req = "require 'gluby_#{base_file_name}'"
         req = "require '#{base_file_name}'"
+
+        GlubyTK.gputs "Checking require entries for #{base_file_name}..."
         file.write("#{g_req}\n") if contents.match(g_req).nil?
         file.write("#{req}\n") if contents.match(req).nil?
       }
@@ -138,8 +150,6 @@ module GlubyTK
 
     # Helpers
 
-    private
-
     def self.get_template_contents(template_name)
       File.read("#{template_dir}#{template_name}")
     end
@@ -153,12 +163,15 @@ module GlubyTK
     end
 
     def self.is_glubytk_directory?(dir = nil)
-      File.exist?(glubytk_rc_path(dir))
+      is_g_project = File.exist?(glubytk_rc_path(dir))
+      
+      GlubyTK.gputs "No GlubyTK project detected. Please make sure you are in the right directory." if !is_g_project
+      
+      return is_g_project
     end
 
     def self.glubytk_rc_path(dir = nil)
       "#{dir || Dir.pwd}/.gluby-tkrc"
     end
-
   end
 end

data/lib/gluby-tk/listener.rb

@@ -0,0 +1,15 @@
+require 'listen'
+module GlubyTK
+  class Listener
+    attr_accessor :listener
+
+    def initialize
+      GlubyTK.gputs "Starting listener..."
+      @listener = Listen.to(Dir.pwd) do |modified, added, removed|
+        GlubyTK::Generator.rebuild if (modified + added + removed).map{|path| File.extname(path)}.select{|extension| extension == '.glade'}.any?
+      end
+      @listener.start
+      sleep
+    end
+  end
+end

data/lib/gluby-tk/logger.rb

@@ -0,0 +1,5 @@
+module GlubyTK
+  def self.gputs value, spaces = 4
+    puts "#{"\s" * spaces}[GlubyTK]: #{value}"
+  end
+end

data/lib/gluby-tk/version.rb

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

data/templates/Gemfile.template

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Listen for interface file changes
+gem 'listen'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluby-tk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - i2097i
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
@@ -106,8 +120,11 @@ files:
 - lib/core_ext/string.rb
 - lib/gluby-tk.rb
 - lib/gluby-tk/generator.rb
+- lib/gluby-tk/listener.rb
+- lib/gluby-tk/logger.rb
 - lib/gluby-tk/version.rb
 - templates/ApplicationWindow.glade.template
+- templates/Gemfile.template
 - templates/application.rb.template
 - templates/includes.rb.template
 - templates/main.rb.template