visualruby 3.0.18 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc6bb765611f2160433ba3069412ab60ed4e37b0
-  data.tar.gz: 909e5bf1145974f0b30d2eb3e8c5e9f54e89ab4d
+  metadata.gz: 89d53a929e3dbdde72949eeb3945e44314d87ce9
+  data.tar.gz: ff359a662d2424710d155da67f4fc3d997aeb1db
 SHA512:
-  metadata.gz: 4a6d8205200d782fe4c8e7a6034afabffca2960f707fc97b97c23fdb1efc6436bd609536bc0db76d79b8fe8a3a9c86ce1f8a81ab89b0bc09d2a48f1fb6d87656
-  data.tar.gz: d5c2a5d933f5a4716a546856dacce21bab642b3d0872f52da1f00a578643056ab196e6a6e71c48c2191cccd233eb3630f4da54a226bf6acbfaf67c6db66385cd
+  metadata.gz: 96baa38366574fd0324da84dac789b71d212cb90d97208ef116e8a21295a21c52a72c18208b73339e8c6304ca6d87f8888ebdb74e9c1c9a5b9d27e4a678b4c31
+  data.tar.gz: 750f9cab07db1069f8d783fe8e1d23adfc987745009d5e0d1d27958134914309f71c37a97286c4399e9aa58632ab19dfb92f67744d91fd99cf04f43d49633731

data/.vr_settings.yaml

@@ -1,23 +1,26 @@
 --- !ruby/object:VR_ENV
 vr_yaml_file: "/home/eric/vrp/vr3/.vr_settings.yaml"
-width: 1308
-height: 761
-panel_pos: 268
-notebook_panel_position: 532
+width: 1389
+height: 874
+panel_pos: 360
+notebook_panel_position: 629
 run_command_line: ruby vr
 open_files:
-- "/home/eric/vrp/vr3/lib/GladeGUI.rb"
+- "/home/eric/vrp/vr3/lib/SavableClass.rb"
+- "/home/eric/vrp/vr3/src/main/VR_Main.rb"
+- "/home/eric/vrp/vr3/examples/settings_file/bin/MainApp.rb"
+- "/home/eric/vrp/vr3/examples/settings_file/bin/SavableSettings.rb"
 - "/home/eric/vrp/vr3/src/editor/VR_Tabs.rb"
-- "/home/eric/vrp/vr3/yard_hack/index.html"
+- "/home/eric/vrp/vr3/src/main/VR_File_Tree.rb"
 - "/home/eric/vrp/vr3/src/editor/VR_Document.rb"
-- "/home/eric/vrp/vr3/examples/settings_file/bin/SavableSettings.rb"
-- "/home/eric/vrp/vr3/examples/settings_file/bin/MainApp.rb"
-- "/home/eric/vrp/vr3/lib/SavableClass.rb"
-- "/home/eric/vrp/vr3/vr.gemspec"
 open_folders:
 - "/home/eric/vrp/vr3"
-current_file: "/home/eric/vrp/vr3/lib/GladeGUI.rb"
-current_line: 310
-rdoc_command_line: yardoc lib - site/*.*
+- "/home/eric/vrp/vr3/lib"
+- "/home/eric/vrp/vr3/src"
+- "/home/eric/vrp/vr3/src/editor"
+- "/home/eric/vrp/vr3/yard_hack"
+current_file: "/home/eric/vrp/vr3/src/editor/VR_Document.rb"
+current_line: 145
+rdoc_command_line: ruby ./../yard/bin/yardoc  -  site/README.md site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/examples/settings_file/bin/MainApp.rb

@@ -5,7 +5,7 @@ class MainApp #(change name)
   
   # make $ENV global object available everywhere
   def before_show()
-    $ENV = VR::load_yaml(:class => SavableSettings, :file_name => "settings.yaml")
+    $ENV = VR::load_yaml(SavableSettings, "settings.yaml")
     @builder[:window1].resize $ENV.width, $ENV.height
     refresh()
   end  

data/lib/ActLikeAHash.rb

@@ -1,12 +1,12 @@
 # @private
-module ActLikeAHash
-
-  def [] (key)
-    instance_variable_get("@" + key.to_s)
-  end
-
-  def []= (key, val)
-    instance_variable_put("@" + key_to_s, val)
-  end
-
-end
+#module ActLikeAHash
+#
+#  def [] (key)
+#    instance_variable_get("@" + key.to_s)
+#  end
+#
+#  def []= (key, val)
+#    instance_variable_put("@" + key_to_s, val)
+#  end
+#
+#end

data/lib/GladeGUI.rb

@@ -1,5 +1,5 @@
 # =GladeGUI
-#
+#  
 # GladeGUI connects your class to a glade form. 
 # It will load a .glade
 # file into memory, enabling your ruby programs to have a GUI interface.
@@ -11,8 +11,7 @@
 # = Include the GladeGUI interface
 #  
 # To use the GladeGUI interface, include this line in your code:
-# 
-# 
+#
 #   class MyClass
 #     include GladeGUI
 #   end
@@ -56,15 +55,15 @@
 #  
 # After show_glade() is called, you can access any of your form's windows or widgets
 # using the @builder variable: 
-# ```ruby 
+# 
 #   @builder["window1"].title = "This is the title that appears at the top."
-# ``` 
+#  
 #  
 # Here's another example:  Suppose you have a glade form with a Gtk::Entry box on it named "email."
 # You could set the text that appears in the Gtk::Entry by setting the Gtk::Entry#text property:
-# ```ruby 
+#  
 #   @builder["email"].text = "harvey@harveyserver.com"
-# ```  
+#   
 # Now the email adddess is set with a new value:
 # 
 # http://visualruby.net/img/gladegui_simple.jpg
@@ -114,7 +113,8 @@ end
 
 
 ##
-# This will Load the glade form according to the naming convention: MyClass.rb => MyClass.glade.  
+# This will Load the glade form according to the naming convention: 
+#   MyClass.rb => MyClass.glade.  
 # It will create a Gtk::Builder object from your glade file.
 # The Gtk::Builder object is stored in the instance variable, @builder.
 # You can get a reference to any of the widgets on the glade form by
@@ -197,11 +197,9 @@ end
 #   set_glade_variables()
 #  
 #  So, to set all the values of a form, simply call the set_glade_all() method instead.
-
   def set_glade_all(obj = self) 
     set_glade_active_record(obj)
     set_glade_variables(obj)
-#    set_glade_hash(obj) if obj.is_a?(Hash) #only needed for Hash subclass. needed?
   end
 
 #  This method is the most useful method to retreive values from a glade form.  It will
@@ -212,7 +210,6 @@ end
 #   get_glade_variables()
 #  
 #  So, to retreive all the values of a form back into your ActiveRecord object and instance variables, simply call the set_glade_all() method instead.
-
   def get_glade_all(obj = self)
     get_glade_active_record(obj)
     get_glade_variables(obj)
@@ -285,7 +282,7 @@ end
     end
   end
   
-
+  # @private 
   def fill_control(glade_name, val) 
     control = @builder[glade_name]
     return unless control
@@ -368,6 +365,7 @@ end
     end
   end
 
+  # @private
   def get_control_value(glade_name)
     return unless control = @builder[glade_name]
     case control
@@ -405,7 +403,7 @@ end
     end
   end
 
-# @private
+  # @private
   def self.included(obj)
     temp = caller[0].split(":") #correct for windows  C:\Users\george etc.
     caller_path_to_class_file, = temp[0].size == 1 ? temp[0] + ":" + temp[1] : temp[0] 

data/lib/SavableClass.rb

@@ -1,58 +1,40 @@
 module VR
 
-  def self.load_yaml(flags)
+  # Loads or creates a yaml file with a given object type (class).
+  # If the file exists already, the object will be returned. If not,
+  # a new instance will be returned, and the file will instantly be saved.
+  # @param [Class] klass The class of the object to be loaded or created
+  # @param [String] file_name File name to save.  Should be named .yaml
+  # @param [Splat] args Optional arguments to pass to contructor of class.  Not used often.
+  # @return [Object] Object of type klass that was loaded or created.
+  def self.load_yaml(klass, file_name, *args)
     me = nil
-    if File.file?(flags[:file_name]) 
-      me = YAML.load(File.open(flags[:file_name]).read)
-    elsif flags[:class]
-      me = flags[:class].new()
+    if File.file?(file_name) 
+      me = YAML.load(File.open(file_name).read)
+    else 
+      me = klass.new(*args)
     end
-    file_name = File.expand_path(flags[:file_name])
+    file_name = File.expand_path(file_name)
     me.instance_variable_set(:@vr_yaml_file, file_name)
     me.defaults() if me.respond_to?(:defaults)
     VR::save_yaml(me)
     return me
   end
 
-  # todo create folders if don't exist
-  def self.save_yaml(obj, filename = nil)
-    filename ||= obj.instance_variable_get(:@vr_yaml_file) 
-    dirname = File.dirname(filename)
-    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-    File.open(filename, "w") {|f| f.puts(obj.to_yaml)}
+  # Saves an object likely loaded with #load_yaml to disk.
+  # @param [Object] obj Object to save in yaml format
+  # @param [String] file_name Optional file name to save yaml file to.  When omitted, 
+  #   it will save file to path where it was opened from.  Only supply this param if you want to
+  #   make another copy of the yaml file.
+  def self.save_yaml(obj, file_name = nil)
+    file_name ||= obj.instance_variable_get(:@vr_yaml_file)
+    dir = File.dirname(file_name)
+    unless File.directory?(dir)
+      FileUtils.mkdir_p(dir) 
+    end
+    File.open(file_name, "w") {|f| f.puts(obj.to_yaml)}
   end
-
+  # Note: can't remove @builder or @top_level_window variables because needed to close window.
 end
 
-#
-#class VR::SavableClass
-#
-#  def initialize(filename = nil)
-#    @filename = filename 
-#    defaults    
-#  end
-#
-#  def self.load_yaml(filename)
-#    if File.file?(filename) 
-#       me = YAML.load(File.open(filename).read)
-#      me.filename = filename
-#      me.defaults()
-#      return me 
-#    else
-#     return nil
-#    end
-#  end
-#
-#  def save_yaml(new_filename = nil)
-#    @filename = new_filename if new_filename
-#    data = YAML.dump(self)
-#    File.open(@filename, "w") {|f| f.puts(data)}
-#  end
-#
-#
-#end
-
-
-
-
-
+   

data/my_yard.yaml

@@ -1,20 +1,18 @@
 --- !ruby/object:MyYard
 project_root: "/home/eric/vrp/vr3"
 output_dir: doc
-theme: visualruby
+theme: default
 template: default
-files: lib/**/*.rb
-extra_files: site/*.*
-exclude: ''
+files: "*/**/*.rb */**/*.c"
+extra_files: "*/**/*.md */**/*.rdoc"
+exclude: "*.glade"
 include_public: true
 include_private: false
 include_protected: false
-no_private: true
-export_db: true
-title: Visual Ruby
+no_private: false
+export_db: false
+title: Get outta my yard!
 vr_yaml_file: "/home/eric/vrp/vr3/my_yard.yaml"
-main: index.html
+main: README.md
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: true
-answer: !ruby/object:VR::Alert::DialogAnswer
-  answer: true

data/src/editor/VR_Document.rb

@@ -3,7 +3,7 @@ class VR_Document < GtkSource::View
   
   include GladeGUI
   include VR_TextViewCommon
-  
+    
   attr_accessor :full_path_file, :title  
 
   def initialize(full_path_file, title_label, main)
@@ -51,13 +51,14 @@ class VR_Document < GtkSource::View
     text = "The file: <b>#{@full_path_file}</b>\n has been modified since you loaded it:\n\nYou loaded: #{@modified_time}\nOn disk: #{mod_time().to_s}\n\nDo you wnat to keep this version?\n"  
     ans = alert(text, headline: "Warning!", width: 400, button_yes: "Keep Current Version", 
             button_no: "Reload Disk Version", button_cancel: "Cancel", parent: @main)
-    if ans == true # yes, keep current 
+    if ans == true # yes, keep current ok 
       write_to_disk()
       return true
-    elsif ans == false # Reload From Disk
-      reload_from_disk()
+    elsif ans == false # Reload From Disk ok
+      reload_from_disk()
+      return true
     end 
-    return false #abort!
+    return false # abort! No resolution.
   end
 
   def write_to_disk(fn = @full_path_file)
@@ -65,15 +66,10 @@ class VR_Document < GtkSource::View
     File.open(fn, "w")  { |f| f.puts(buffer.text) }
     buffer.modified = false
     @modified_time = mod_time()
-    @title.label = File.basename(fn)
-    return true  
+    @title.label = File.basename(fn) 
   end
-
-
-
-
 
- def jump_to_line(line_num, search_str = nil)
+  def jump_to_line(line_num, search_str = nil)
     while (Gtk.events_pending?)
       Gtk.main_iteration
     end

data/src/editor/VR_Tabs.rb

@@ -47,27 +47,24 @@ class VR_Tabs < Gtk::Notebook
         return save_as() 
       else
         return @docs[page].write_to_disk()
-    end      
+      end      
     elsif answer == false # Discard Changes
       @docs[page].reload_from_disk()
       return true #continue without saving
     end
     return false #abort!  
   end
-
+  
   def try_to_save(ask = true)
-    return false if not @docs[page].modified_time_matches()
+#    return false if not @docs[page].modified_time_matches()
     return true if @docs[page].empty?
-    if (@docs[page].title.label == "Untitled")
-      return save_changes? 
-    elsif (@docs[page].buffer.modified? and ask)  
-      return save_changes? 
-    elsif @docs[page].buffer.modified?
+    if (@docs[page].title.label == "Untitled") or (@docs[page].buffer.modified? and ask)  
+      return save_changes? 
+    end
+    if @docs[page].buffer.modified?
       @docs[page].write_to_disk()
-      return true
-    else
-      return true
-    end    
+    end
+    return true   
   end
 
 
@@ -75,18 +72,21 @@ class VR_Tabs < Gtk::Notebook
     @docs.each { |doc| doc.update_style() }
   end
 
+  def modified_times_ok()
+    answers = @docs.each.collect { |doc| doc.modified_time_matches }
+    return !answers.include?(false)
+  end
+
   # Tries to save and/or close all open documents
   # @param [Hash] flags Optiions
   # @option [Boolean] ask Whether or not to ask to save or save without asking.
-  # @option [Boolean] close Close tab when finished
-  # @option [String] folder operate only on folders matching this string.  Default = "/" 
-  def try_to_save_all(flags)
-    ask = flags[:ask]
-    folder ||= "/"
+  # @option [Boolean] close Close tab when finished 
+  def try_to_save_all(flags)
+    return false unless modified_times_ok()  
     passed = true 
     (0..n_pages-1).each do |i|
-      page = i
-      unless try_to_save(ask)
+      self.page = i
+      unless try_to_save(flags[:ask])
         passed = false
       end
     end  
@@ -94,20 +94,7 @@ class VR_Tabs < Gtk::Notebook
     return passed  
   end
 
-##todo update file_tree!
-#  def try_to_save_all(ask = true)
-#    @docs.each do |doc|
-#      return false unless doc.try_to_save(ask)
-#    end
-#  end
-#
-##todo update file_tree!
-#  def try_to_close_all(ask = true)
-#    return false unless try_to_save_all(ask)
-#    (n_pages).times { destroy_tab() }
-#  end
-
-
+ 
   def switch_to(path)
     i = tab_number(path)
     return false if i.nil?  

data/src/main/NewProjectGUI.rb

@@ -5,7 +5,7 @@ class NewProjectGUI
 
   def initialize(parent)
     @parent = parent
-    @projects_home = $VR_ENV_GLOBAL.projects_home # sets in glade
+    @projects_home = $VR_ENV_GLOBAL.projects_home + "/" # sets in glade
   end
 
   def buttonCreate__clicked(*args)

data/src/main/VR_File_Tree.rb

@@ -9,7 +9,7 @@ class VR_File_Tree < VR::FileTreeView
     @api = RubygemsAPI.new
     load_glade() # loads menus
   end
-
+ 
   def self__row_activated(*args)
     return unless rows = selected_rows
     file_name = rows.first[:path]

data/src/main/VR_Main.rb

@@ -17,7 +17,7 @@ class VR_Main
     menuInstallExamples__activate if not File.directory?(required_project)
 
     # load global settings (requires /home/visuaruby folder exists
-    $VR_ENV_GLOBAL = VR::load_yaml(:class => VR_ENV_GLOBAL, :file_name => VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
+    $VR_ENV_GLOBAL = VR::load_yaml(VR_ENV_GLOBAL, VR_ENV_GLOBAL::GLOBAL_SETTINGS_FILE)
 
     # try to open right project
     if not project_valid?(@proj_path) 
@@ -253,7 +253,7 @@ class VR_Main
   end
 
   def load_state
-    $VR_ENV = VR::load_yaml(:class => VR_ENV, :file_name => VR_ENV::SETTINGS_FILE)
+    $VR_ENV = VR::load_yaml(VR_ENV, VR_ENV::SETTINGS_FILE)
     @builder["window1"].resize($VR_ENV.width, $VR_ENV.height)
     @builder['panelMain'].set_position($VR_ENV.panel_pos)
     @builder["panelNotebook"].set_position($VR_ENV.notebook_panel_position)
@@ -309,8 +309,7 @@ class VR_Main
   # needed so tabs can be saved, called before destroy, must return false to close wndow.
   def window1__delete_event(*args)
     save_state
-    return true unless @tabs.try_to_save_all(:ask=>true)
-    return false #ok to close
+    return !@tabs.try_to_save_all(:ask=>true)
   end
 
   def menuQuit__activate(*a)   
@@ -320,6 +319,8 @@ class VR_Main
   def tabs__switch_page(_self, x, page_num)
     return unless tab = @tabs.docs[page_num] # needed. sometimes nil
     @builder[:labelStatus].label = "Project:  #{@proj_path}       File:  #{tab.full_path_file}"
+    tab.modified_time_matches()
   end
 
 end
+   

data/src/main/VR_Tools.rb

@@ -45,7 +45,7 @@ module VR_Tools
 Gem::Specification.new do |s|
   s.name = "#{File.basename(Dir.pwd).downcase}"  # i.e. visualruby.  This name will show up in the gem list.
   s.version = "0.0.1"  # i.e. (major,non-backwards compatable).(backwards compatable).(bugfix)
-  s.add_dependency "visualruby", ">= 3.0.15"
+  s.add_dependency "visualruby", ">= 3.0.18"
   s.add_dependency "require_all", ">= 1.2.0"
   s.has_rdoc = false
   s.authors = ["Your Name"] 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.19
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3