gluby-tk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad90cf42c1588d6db4fb155446f3a1b886e4e3f
-  data.tar.gz: cc7d20313f3eb5d67ba937ab9e2609cf8427fd9e
+  metadata.gz: 88bdbec6a3b26aeaaedbef372b27927afbae8b4f
+  data.tar.gz: 2192394b9cefcc9e37d9528e7a97ba2ce89218bc
 SHA512:
-  metadata.gz: 660e04649c0488660ff22af4f726f5ee9345e31eeb24d0cc2c759c6fa6e6e3617d236b1c686e8b159557e063ae5a9cc58f7277c97d57a395fd9404d34bf5828e
-  data.tar.gz: b954a8701a12e455cda5fd7b431ec3bca205d50b67c05a164c739c6cf93302842c989f3ee9854cc6bae7f8e7e0f62e9645abe1b217d2c822312efe1fbc783118
+  metadata.gz: f026a3bee2456fb7e92ae94f22836d83264400b88f79c663c261617aed073bc1c7ada621e3d9c521e1cab624c1f2f65daa6678b608e22cad783f63a93e2fe51c
+  data.tar.gz: fce9719f976b68e9df469b248874ef173c0f84d7ec01fdf26692f439b61cdf5544365089762fb2a84313120e9f0a3ca76b84023b4723b5b7dd476c2ffcfc6fe3

data/bin/{gluby-tk → gluby}

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require "gluby-tk"
+require "wannabe_bool"
 
 # options = {}
 
@@ -28,6 +29,8 @@ if ARGV[0] == "new"
     puts "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)
 end
 
 exit(0)

data/lib/core_ext/string.rb

@@ -1,5 +1,18 @@
 class String
+  DISALLOWED_CHARACTERS = "[\-\s\.\,\?\'\"\:\;\\\/]"
+
   def humanize
-    self.gsub("_", " ").gsub("-", " ").split(" ").map(&:capitalize).join("")
+    gsub(DISALLOWED_CHARACTERS, " ").split(" ").map(&:capitalize).join("")
   end
+
+  def underscore
+    u = ""
+    sanitize.split("").each_with_index do |c, i|; if i > 0 && c == c.upcase; u += " "; end; u += c.downcase; end;
+    u.gsub(" ", "_")
+  end
+
+  def sanitize
+    gsub(DISALLOWED_CHARACTERS, "_")
+  end
+
 end

data/lib/gluby-tk/generator.rb

@@ -1,7 +1,14 @@
+require 'nokogiri'
+require 'pp'
+
 module GlubyTK
   class Generator
     def self.create app_name
-      puts "#{app_name} already exists!" and exit(1) if File.exist?(app_name)
+      if File.exist?(app_name)
+        puts "#{app_name} already exists!"
+        exit(1)
+      end
+
       root = "#{Dir.pwd}/#{app_name}"
       directories = [
         "assets",
@@ -13,10 +20,6 @@ module GlubyTK
         "src/controller"
       ]
 
-      templates = [
-        "src/application.rb",
-      ]
-
       # Create root directory
       Dir.mkdir "#{Dir.pwd}/#{app_name}"
 
@@ -30,97 +33,94 @@ module GlubyTK
         file.write(get_template_contents("includes.rb.template"))
       }
       
-      # Create base module
-      module_name = "#{app_name.downcase}"
+      # Create app entry point
+      module_name = "#{app_name.underscore}"
+      app_id = module_name.humanize.downcase
+
       main_file = "#{root}/#{module_name}.rb"
       File.open(main_file, "w+") { |file| 
-        # file.write("module #{module_name.humanize}\n\nend\n")
         file.write(get_template_contents("boot.rb.template"))
       }
+      File.open("#{root}/.gluby-tkrc", "w+") { |file|
+        file.write(module_name)
+      }
 
-      app_id = module_name.humanize.downcase
       # Create Application
       File.open("#{root}/src/application.rb", "w+") { |file|
+        file.write(get_template_contents("application.rb.template").gsub("gluby-tk_app_id", app_id))
+      }
 
-        file.write("class Application < Gtk::Application
-  def initialize
-    super('app.#{app_id}', :handles_open)
-    # TODO: Go to login screen if user is not ready logged in
-    signal_connect 'activate' do |application|
-      @window = ApplicationWindow.new(:application => application)
-      @window.present
-    end
-  end
-end
-")
+      # Make initial application window
+      File.open("#{root}/interface/ApplicationWindow.glade", "w+") { |file|
+        file.write(get_template_contents("ApplicationWindow.glade.template"))
       }
 
-      # Create ApplicationWindow
-      File.open("#{root}/src/view/application_window.rb", "w+") { |file|
-        file.write("class ApplicationWindow < Gtk::ApplicationWindow
-  type_register
-  class << self
-    def init
-      set_template(:resource => '/app/#{app_id}/ApplicationWindow.glade')
-      # Specify the any UI elements you need to reference in code using the glade ID
-      [\"main_box\", \"welcome_label\"].each{|child_id| bind_template_child(child_id)}
+      rebuild(root, true)
     end
-  end
-  
-  def initialize(application: application)
-    super(application: application)
-  end
-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
+
+      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>"
+        if generate_ruby_classes
+          generate_ruby_class_for_document(File.basename(filename), File.read(filename), root)
+        end
       }
+      gresource_file_contents += "</gresources>\n"
 
       File.open("#{root}/interface/interface.gresource.xml", "w+") { |file|
-        file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<gresources>
-  <gresource prefix=\"/app/#{app_id}\">
-    <file preprocess=\"xml-stripblanks\">ApplicationWindow.glade</file>
-  </gresource>
-</gresources>
-")
+        file.write(Nokogiri::XML(gresource_file_contents, &:noblanks))
       }
+    end
 
-      File.open("#{root}/interface/ApplicationWindow.glade", "w+") { |file|
-        file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!-- Generated with glade 3.20.0 -->
-<interface>
-  <requires lib=\"gtk+\" version=\"3.20\"/>
-  <template class=\"ApplicationWindow\" parent=\"GtkApplicationWindow\">
-    <property name=\"can_focus\">False</property>
-    <property name=\"window_position\">center</property>
-    <property name=\"icon_name\">computer</property>
-    <property name=\"gravity\">center</property>
-    <property name=\"show_menubar\">False</property>
-    <child>
-      <object class=\"GtkBox\" id=\"main_box\">
-        <property name=\"width_request\">300</property>
-        <property name=\"height_request\">300</property>
-        <property name=\"visible\">True</property>
-        <property name=\"can_focus\">False</property>
-        <property name=\"orientation\">vertical</property>
-        <child>
-          <object class=\"GtkLabel\" id=\"welcome_label\">
-            <property name=\"visible\">True</property>
-            <property name=\"can_focus\">False</property>
-            <property name=\"label\" translatable=\"yes\">Welcome to #{module_name.humanize}!\n\nBuilt with RGTK</property>
-          </object>
-          <packing>
-            <property name=\"expand\">False</property>
-            <property name=\"fill\">True</property>
-            <property name=\"position\">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
-")
+    def self.generate_ruby_class_for_document(file_name, file_contents, root)
+      doc = Nokogiri::XML(file_contents)
+      
+      if doc.css("template").first.nil?
+        main_template = doc.css("object").first
+        class_name = main_template["id"]
+        parent = main_template["class"]
+      else
+        main_template = doc.css("template").first
+        class_name = main_template["class"]
+        parent = main_template["parent"]
+      end
+      
+      parent = parent.gsub("Gtk","")
+
+      class_file_contents = [
+        "class #{class_name} < Gtk::#{parent}",
+        "\ttype_register",
+        "\tclass << self",
+        "\t\tdef init",
+        "\t\t\tset_template(:resource => '/app/#{current_app_name(root)}/#{file_name}')",
+        "\t\t\t#{doc.css("[id]").map{|e| e.attributes["id"].value }.to_s}.each{|child_id| bind_template_child(child_id)}",
+        "\t\tend",
+        "\tend",
+        "end"
+      ].join("\n")
+
+      new_file_path = "#{root}/src/view/#{file_name.gsub(File.extname(file_name), "").underscore}.rb"
+      File.open(new_file_path, "w+") { |file|
+        file.write class_file_contents
       }
     end
 
+    # Helpers
+
+    private
+
     def self.get_template_contents(template_name)
       File.read("#{template_dir}#{template_name}")
     end
@@ -128,5 +128,18 @@ end")
     def self.template_dir
       "#{File.dirname(File.dirname(File.dirname(__FILE__)))}/templates/"
     end
+
+    def self.current_app_name(dir = nil)
+      File.read(glubytk_rc_path(dir)).strip
+    end
+
+    def self.is_glubytk_directory?(dir = nil)
+      File.exist?(glubytk_rc_path(dir))
+    end
+
+    def self.glubytk_rc_path(dir = nil)
+      "#{dir || Dir.pwd}/.gluby-tkrc"
+    end
+
   end
 end

data/lib/gluby-tk/version.rb

@@ -1,3 +1,3 @@
 module GlubyTK
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/templates/ApplicationWindow.glade.template

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <template class="ApplicationWindow" parent="GtkApplicationWindow">
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <property name="icon_name">computer</property>
+    <property name="gravity">center</property>
+    <property name="show_menubar">False</property>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="width_request">300</property>
+        <property name="height_request">300</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="welcome_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Built with Gluby-TK</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>

data/templates/application.rb.template

@@ -0,0 +1,9 @@
+class Application < Gtk::Application
+  def initialize
+    super('app.gluby-tk_app_id', :handles_open)
+    signal_connect 'activate' do |application|
+      @window = ApplicationWindow.new(:application => application)
+      @window.present
+    end
+  end
+end

data/templates/includes.rb.template

@@ -5,6 +5,7 @@ $: << 'src/controller/'
 $: << 'src/helpers/'
 
 # Dependencies
+require 'fileutils'
 require 'gtk3'
 require 'application_window'
 require 'application'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluby-tk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - i2097i
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,19 +52,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+- !ruby/object:Gem::Dependency
+  name: wannabe_bool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: A tool for creating GTK applications using Ruby and Glade
 email:
 - i2097i@hotmail.com
 executables:
-- gluby-tk
+- gluby
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/gluby-tk
+- bin/gluby
 - lib/core_ext/string.rb
 - lib/gluby-tk.rb
 - lib/gluby-tk/generator.rb
 - lib/gluby-tk/version.rb
+- templates/ApplicationWindow.glade.template
+- templates/application.rb.template
 - templates/boot.rb.template
 - templates/includes.rb.template
 homepage: https://github.com/i2097i/gluby-tk