visualruby 3.0.2 → 3.0.3

data/bin/main/ProjectChooserView.rb

@@ -1,40 +1,40 @@
 
 class ProjectChooserView < VR::ListView
 
-	PIX = Gdk::Pixbuf.new(File.dirname(__FILE__) + "/../../img/folder.png")
+  PIX = Gdk::Pixbuf.new(File.dirname(__FILE__) + "/../../img/folder.png")
 
-	def initialize()
-		super(:folder => {:pix => Gdk::Pixbuf, :file_name => String}, :modified => DateTime) 
-		ren_xalign(:modified => 1)
-		col_xalign(:modified => 1)
-		col_sort_column_id(:modified => id(:modified), :pix => id(:file_name))
-	end
+  def initialize()
+    super(:folder => {:pix => Gdk::Pixbuf, :file_name => String}, :modified => DateTime) 
+    ren_xalign(:modified => 1)
+    col_xalign(:modified => 1)
+    col_sort_column_id(:modified => id(:modified), :pix => id(:file_name))
+  end
 
-	def refresh(show_backup = false)
-#		model.set_sort_column_id(1, :ascending)
-		self.model.clear
-		pattern = ""
-		backup_path = Dir.pwd.gsub(ENV["HOME"], File.join(ENV["HOME"], "visualruby_backup"))
-		backup_ar = File.split(backup_path)
-		backup_ar << ["**", VR_ENV::SETTINGS_FILE]
-		if show_backup
-			pattern = File.join(*backup_ar)
-		else
-			pattern = File.join(ENV["HOME"], "visualruby", "**", VR_ENV::SETTINGS_FILE)
-		end
-		Dir.glob(pattern, File::FNM_DOTMATCH).each do |fn|
-			next if not show_backup and fn =~ / Backup /  
-			next if show_backup and not fn =~ / Backup / 
-			t = File.stat(fn).mtime
-			row = add_row()
-			row[:pix] = PIX
-			row[:file_name] = File.dirname(fn)
-			row[:modified] = DateTime.parse(t.to_s)
-		end	
+  def refresh(show_backup = false)
+    # model.set_sort_column_id(1, :ascending)
+    self.model.clear
+    pattern = ""
+    backup_path = Dir.pwd.gsub(ENV["HOME"], File.join(ENV["HOME"], "visualruby_backup"))
+    backup_ar = File.split(backup_path)
+    backup_ar << ["**", VR_ENV::SETTINGS_FILE]
+    if show_backup
+      pattern = File.join(*backup_ar)
+    else
+      pattern = File.join(ENV["HOME"], "visualruby", "**", VR_ENV::SETTINGS_FILE)
+    end
+    Dir.glob(pattern, File::FNM_DOTMATCH).each do |fn|
+      next if not show_backup and fn =~ / Backup /  
+      next if show_backup and not fn =~ / Backup / 
+      t = File.stat(fn).mtime
+      row = add_row()
+      row[:pix] = PIX
+      row[:file_name] = File.dirname(fn)
+      row[:modified] = DateTime.parse(t.to_s)
+    end  
 
-#		model.set_sort_column_id(id(:modified), :descending)
-	end	
-	
+#    model.set_sort_column_id(id(:modified), :descending)
+  end  
+  
 end
 
 

data/bin/main/ProjectTree.rb

@@ -1,25 +1,25 @@
 
 class ProjectTree < VR::FileTreeView  #(change name)
  
-	attr_accessor :ftv
+  attr_accessor :ftv
 
-	include GladeGUI
+  include GladeGUI
 
-	def initialize()
-		path = $VR_ENV_GLOBAL.projects_home
-		icon_path = File.expand_path(File.join(File.path(__FILE__), "..", "..", "..", "img"))
-		super(path, icon_path)
-		@test_block = proc { |folder| has_settings_file?(folder) } 
-		open_folders($VR_ENV_GLOBAL.projects_home_open_folders) 
-	end
+  def initialize()
+    path = $VR_ENV_GLOBAL.projects_home
+    icon_path = File.expand_path(File.join(File.path(__FILE__), "..", "..", "..", "img"))
+    super(path, icon_path)
+    @test_block = proc { |folder| has_settings_file?(folder) } 
+    open_folders($VR_ENV_GLOBAL.projects_home_open_folders) 
+  end
 
-	def has_settings_file?(path)
-		Find.find(path) do |file|
-  		if File.basename(file) == VR_ENV::SETTINGS_FILE
-				return true
-			end
-		end
-		return false
-	end
+  def has_settings_file?(path)
+    Find.find(path) do |file|
+      if File.basename(file) == VR_ENV::SETTINGS_FILE
+        return true
+      end
+    end
+    return false
+  end
 
 end

data/bin/main/RubygemsAPI.rb

@@ -1,97 +1,107 @@
 
 class RubygemsAPI 
 
-	include GladeGUI
+  include GladeGUI
 
-	CREDENTIALS_FILE = File.join(ENV['HOME'], ".gem", "credentials")
+  CREDENTIALS_FILE = File.join(ENV['HOME'], ".gem", "credentials")
 
-	def initialize
-		uri = URI.parse("https://rubygems.org")
-		@http = Net::HTTP.new(uri.host, uri.port)
-		@http.use_ssl = true
-  	@http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  def initialize
+    uri = URI.parse("https://rubygems.org")
+    @http = Net::HTTP.new(uri.host, uri.port)
+    @http.use_ssl = true
+    @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     load_glade()
-	end
+  end
   
-	def get_key()
-		if File.file?(CREDENTIALS_FILE)
-			return Gem.configuration.rubygems_api_key
-		end
-		return set_up_key()
-	end
+  def get_key()
+    if File.file?(CREDENTIALS_FILE)
+      return Gem.configuration.rubygems_api_key
+    end
+    return set_up_key()
+  end
+
+def set_up_key()
+    @username = ""
+    @password = ""
+    key = nil
+    set_glade_all()
+    response_id = @builder["dialog1"].run  
+    @builder["dialog1"].hide
+    return unless response_id == 1    
+    get_glade_all() #gets @username, @password
+    begin
+      @http.start() do |h|
+        req = Net::HTTP::Get.new("/api/v1/api_key.yaml")
+        req.basic_auth @username, @password
+        response = h.request(req)
+        obj = YAML.load(response.body)
+        key = obj[:rubygems_api_key]
+        if key
+          File.open(CREDENTIALS_FILE,"w",0600) { |f| f.write(YAML.dump(obj)) } 
+        else
+          alert "Rubygems response:  \n" + obj.to_s
+        end
+      end
+    rescue
+      alert "Problem connecting to rubygems.org"
+    end 
+    return key
+  end
 
-	def set_up_key()
-		@username = ""
-		@password = ""
-		key = nil
-		set_glade_all()
-		@builder["dialog1"].run do |response_id|
-			if response_id == 1 #Ok Button
-    		get_glade_all() #gets @username, @password
-alert "You: " + @username + @password
-    		path = "/api/v1/api_key.yaml"
-    		@http.start() do |h|
-        	req = Net::HTTP::Get.new(path)
-        	req.basic_auth @username, @password
-      		response = h.request(req)
-      		obj = YAML.load(response.body)
-          alert obj.to_s
-      		key = obj[:rubygems_api_key]
-					if key
-      			File.open(CREDENTIALS_FILE,"w",0600) { |f| f.write(YAML.dump(obj)) }
-					else
-						alert obj.values[0]
-					end 
-				end
-			end
-		end
-		@builder["dialog1"].hide
-		return key
-	end
 
 
-	def get_obj_url(path)
-		return nil unless key = get_key()
-		@http.start() {|h|
+  def get_obj_url(path)
+    return nil unless key = get_key()
+    @http.start() {|h|
       req = Net::HTTP::Get.new(path)
-			response = h.request_get(path, 'Authorization' => key)
-			return obj = YAML.load(response.body)	
+      response = h.request_get(path, 'Authorization' => key)
+      return obj = YAML.load(response.body)  
     }
-	end
+  end
 
 
 # in Windows, the File.open { read } doesn't work for the gemfile.
 # also, you must set a variable (bod) to close the io stream
 
-	def push_gem(fn)
+  def push_gem(fn)
     unless key = get_key()
       return "No Rubygems Credentials" 
     end
     path = "https://rubygems.org/api/v1/gems"
-    req = Net::HTTP::Post.new(path)	
-    req.add_field('Authorization', key) 	
+    req = Net::HTTP::Post.new(path)  
+    req.add_field('Authorization', key)   
     req.content_type = 'application/octet-stream'
     bod = File.open(fn, "rb") {|io| io.read } # no good in win: File.open(fn).read
     req.body = bod #must do it like this to close io ??!?!
-    req.content_length = req.body.size
-    @http.start() do |h|
-      response = h.request(req)
-      return response.message	
+    req.content_length = req.body.size
+    begin 
+      @http.start() do |h|
+        response = h.request(req)
+        return response.message  
+      end
+    rescue
+      alert "Problem connecting to rubygems.org"
+      return "Problem connecting to rubygems.org"
     end
-	end
+  end
 
-	def yank_gem(name, ver)
+  def yank_gem(name, ver)
     return unless key = get_key()
     path = "/api/v1/gems/yank?gem_name=#{URI.encode(name)}&version=#{URI.encode(ver)}"
-    req = Net::HTTP::Delete.new(path)		
+    req = Net::HTTP::Delete.new(path)    
     req.add_field('Authorization', key) 
     req.add_field 'Connection', 'keep-alive'
     req.add_field 'Keep-Alive', '30'
     req.content_type = 'application/x-www-form-urlencoded'
-    @http.start() do |h|
-      response = h.request(req)
-      return response.message	
+    begin
+      @http.start() do |h|
+        response = h.request(req)
+        return response.message  
+      end
+    rescue
+      alert "Problem connecting to rubygems.org"
+      return "Problem connecting to rubygems.org"
     end
-    end
-	
+  end
+  
 end

data/bin/main/VR_ENV.rb

@@ -1,38 +1,38 @@
 class VR_ENV 
 
-	include GladeGUI
+  include GladeGUI
 
-	SETTINGS_FILE = ".vr_settings.yaml"
+  SETTINGS_FILE = ".vr_settings.yaml"
 
-	attr_accessor :width, :height, :panel_pos, :rdoc_command_line
-	attr_accessor :run_command_line, :open_files, :open_folders, :current_file
+  attr_accessor :width, :height, :panel_pos, :rdoc_command_line
+  attr_accessor :run_command_line, :open_files, :open_folders, :current_file
   attr_accessor :notebook_panel_position, :current_line
 
-	#to add setting, just add to list
-	def defaults
-		@width ||= 800
-		@height ||= 600
-		@panel_pos ||= 360
-		@notebook_panel_position ||= 400
-		@run_command_line ||= "ruby main.rb"
-		@open_files ||= []
-		@open_folders ||= []
-		@current_file ||= ""
-		@current_line ||= 1
-		@rdoc_command_line ||= "rdoc -x README"
-	end 
-
-
-	#todo validate
-	def buttonSave_clicked
-		get_glade_variables
-		VR::save_yaml(self)
-		@builder["window1"].destroy
-	end
-
-	def buttonCancel__clicked(*args)
-		@builder["window1"].destroy
-	end		
+  #to add setting, just add to list
+  def defaults
+    @width ||= 800
+    @height ||= 600
+    @panel_pos ||= 360
+    @notebook_panel_position ||= 400
+    @run_command_line ||= "ruby main.rb"
+    @open_files ||= []
+    @open_folders ||= []
+    @current_file ||= ""
+    @current_line ||= 1
+    @rdoc_command_line ||= "rdoc -x README"
+  end 
+
+
+  #todo validate
+  def buttonSave_clicked
+    get_glade_variables
+    VR::save_yaml(self)
+    @builder["window1"].destroy
+  end
+
+  def buttonCancel__clicked(*args)
+    @builder["window1"].destroy
+  end    
 
 end
 

data/bin/main/VR_ENV_GLOBAL.rb

@@ -1,65 +1,65 @@
 
 class VR_ENV_GLOBAL
-		
-	GLOBAL_SETTINGS_FILE = File.join(ENV["HOME"], "visualruby", ".global_settings.yaml")
+    
+  GLOBAL_SETTINGS_FILE = File.join(ENV["HOME"], "visualruby", ".global_settings.yaml")
 
-	include GladeGUI
-	
-	attr_accessor :browser, :tab_spaces, :glade_path, :default_project, :projects_home_open_folders
-	attr_accessor :font_name, :settings_file_version, :projects_home
+  include GladeGUI
+  
+  attr_accessor :browser, :tab_spaces, :glade_path, :default_project, :projects_home_open_folders
+  attr_accessor :font_name, :settings_file_version, :projects_home
  
-	def defaults()
-		@browser ||= "firefox"
-		@tab_spaces ||= 2
-		@font_name ||= "Monospace 10"
-		@glade_path ||= "glade"
-		@projects_home ||= File.join(ENV["HOME"], "visualruby")
-		@projects_home_open_folders ||= [@projects_home]
-		@default_project ||= File.join(ENV["HOME"], "visualruby", "examples", "treeview")
-	end
+  def defaults()
+    @browser ||= "firefox"
+    @tab_spaces ||= 2
+    @font_name ||= "Monospace 10"
+    @glade_path ||= "glade"
+    @projects_home ||= File.join(ENV["HOME"], "visualruby")
+    @projects_home_open_folders ||= [@projects_home]
+    @default_project ||= File.join(ENV["HOME"], "visualruby", "examples", "treeview")
+  end
 
-	def before_show
-		@builder["font_name"].show_size = true
-	end
+  def before_show
+    @builder["font_name"].show_size = true
+  end
 
-	def buttonSave_clicked
-		if valid?
-			get_glade_variables
-			@tab_spaces = @builder['tab_spaces'].text.to_i
-			VR::save_yaml(self)
-			@builder["window1"].destroy
-		end
-	end
+  def buttonSave_clicked
+    if valid?
+      get_glade_variables
+      @tab_spaces = @builder['tab_spaces'].text.to_i
+      VR::save_yaml(self)
+      @builder["window1"].destroy
+    end
+  end
 
-	def valid?  # must validate form, not variables
-		tab_spaces = @builder['tab_spaces'].text.to_i
-		if tab_spaces < 0 or tab_spaces > 9
-			alert("Tab spaces must be between 1 and 9", :parent=>self)
-			return false
-		elsif not File.directory?(@builder[:projects_home].text)
-			alert("Projects home folder is not valid.", :parent=>self)
-			return false			
-		elsif not File.exists?(File.join(@builder[:default_project].text,VR_ENV::SETTINGS_FILE))
-			alert("Default project is not valid.", :parent=>self)
-			return false			
-		end
-		return true
-	end
+  def valid?  # must validate form, not variables
+    tab_spaces = @builder['tab_spaces'].text.to_i
+    if tab_spaces < 0 or tab_spaces > 9
+      alert("Tab spaces must be between 1 and 9", :parent=>self)
+      return false
+    elsif not File.directory?(@builder[:projects_home].text)
+      alert("Projects home folder is not valid.", :parent=>self)
+      return false      
+    elsif not File.exists?(File.join(@builder[:default_project].text,VR_ENV::SETTINGS_FILE))
+      alert("Default project is not valid.", :parent=>self)
+      return false      
+    end
+    return true
+  end
 
-	def buttonCancel__clicked(*args)
-		@builder["window1"].destroy
-	end		
+  def buttonCancel__clicked(*args)
+    @builder["window1"].destroy
+  end    
 
-	def buttonTryGlade__clicked(*argv)
-		VR_Tools.popen(@glade_path)
-	end
+  def buttonTryGlade__clicked(*argv)
+    VR_Tools.popen(@glade_path)
+  end
 
-	def buttonTryBrowser__clicked(*argv)
-		VR_Tools.popen(@browser)
-	end
+  def buttonTryBrowser__clicked(*argv)
+    VR_Tools.popen(@browser)
+  end
 
-	def buttonCurrent__clicked(*argv)
-		@builder["default_project"].text = Dir.pwd
-	end
+  def buttonCurrent__clicked(*argv)
+    @builder["default_project"].text = Dir.pwd
+  end
 
 end