visualruby 1.0.19 → 3.0.2

data/bin/main/NewProjectGUI.rb

@@ -3,30 +3,31 @@ class NewProjectGUI
 
 	include GladeGUI
 
+	attr_accessor :my_var
+
 	def initialize(parent)
 		@parent = parent
-		@parent.proj_path = nil
-	end
-
-	def before_show
-		@builder["labelHomePath"].label = File.join(ENV["HOME"], "visualruby" + "/")
+		@projects_home = $VR_ENV_GLOBAL.projects_home + "/"
 	end
 
-	def buttonCreate__clicked(*a)
+	def buttonCreate__clicked(*args)
 		fn = @builder["entryFolderName"].text
-		fn = fn.gsub(/[^\w\.]/, '_')
-		path = File.expand_path(File.join("~", "visualruby", fn))
+		fn = fn.gsub(/[^\w\.\/]/, '_')
+		path = File.join($VR_ENV_GLOBAL.projects_home + "/" + fn)
 		if File.directory?(path)
-			VR::msg "That folder already exists.  You can delete it and try again."
+			alert "The folder <b>" + path + "</b> is already ok disk.  You can open it using the <b>Open Project</b> button.",
+				:headline=> "Project Already Exists", :parent => self, :width => 500
 		else
-			Dir.mkdir path
+			FileUtils.mkpath path
+			VR_Tools.copy_skeleton_project(path)
 			@parent.proj_path = path
-			destroy_window()
+			@builder["window1"].destroy
 		end
 	end
 
-	def buttonCancel__clicked(*a)
-		destroy_window()
+	def buttonCancel__clicked(*args)
+		@my_var = "Hello"
+#		@builder["window1"].destroy
 	end
 
 end

data/bin/main/OpenProject.rb

@@ -0,0 +1,69 @@
+
+class OpenProject
+
+	include GladeGUI
+
+	def initialize(parent)
+		@parent = parent
+		@projects_home = $VR_ENV_GLOBAL.projects_home
+	end
+
+	def before_show
+		@ftv = ProjectTree.new()
+		@ftv.set_show_expanders(false)
+		@builder["view"].add(@ftv)
+		@ftv.visible = true
+	end
+
+	def ftv__cursor_changed(*a)
+		return unless row = @ftv.selected_rows.first
+		@ftv.expand_or_collapse_folder() 
+	end
+
+  def ftv__row_activated(_self, path, col)
+		buttonOpen__clicked 
+	end
+
+	def buttonChange__clicked(*a)
+		$VR_ENV_GLOBAL.show_glade(self)
+		@projects_home = $VR_ENV_GLOBAL.projects_home
+		@ftv.refresh(:root => @projects_home)
+		@builder[:projects_home].label = @projects_home
+	end
+
+	def buttonDelete__clicked(*a)
+  	return unless row = @ftv.selected_rows.first
+		return if row[:path] == Dir.pwd  #can't delete current project
+		if alert("Do you really want to delete  \n<b>" + row[:path] + " </b>?", 
+				parent: self, headline: "Warning!", button_yes: "Delete", button_no: "Cancel", width: 400)
+  		FileUtils.remove_dir(row[:path], true)
+			@ftv.refresh()
+  	end
+	end
+
+	def buttonOpen__clicked(*a)
+  		return unless row = @ftv.selected_rows.first
+			test_file = File.join(row[:path], VR_ENV::SETTINGS_FILE)
+			if File.exists?(test_file) 
+ 				@parent.proj_path = row[:path]
+				buttonCancel__clicked
+			else
+#				alert("This is not a visualruby project.  It's a folder that holds visualruby projects.", :parent=>self, :width=>400)
+				@ftv.expand_or_collapse_folder()
+			end
+	end
+
+	def buttonNew__clicked(*a)
+		old_proj_path = @parent.proj_path
+		NewProjectGUI.new(@parent).show_glade(self)
+		@builder[:window1].destroy if @parent.proj_path != old_proj_path  #new path created!
+	end
+
+
+	def buttonCancel__clicked(*a) #save state
+		$VR_ENV_GLOBAL.projects_home_open_folders = @ftv.get_open_folders()
+		VR::save_yaml($VR_ENV_GLOBAL)
+		@builder["window1"].destroy		
+	end
+
+end

data/bin/main/ProjectChooserView.rb

@@ -11,7 +11,7 @@ class ProjectChooserView < VR::ListView
 	end
 
 	def refresh(show_backup = false)
-		model.set_sort_column_id(1)
+#		model.set_sort_column_id(1, :ascending)
 		self.model.clear
 		pattern = ""
 		backup_path = Dir.pwd.gsub(ENV["HOME"], File.join(ENV["HOME"], "visualruby_backup"))
@@ -31,7 +31,8 @@ class ProjectChooserView < VR::ListView
 			row[:file_name] = File.dirname(fn)
 			row[:modified] = DateTime.parse(t.to_s)
 		end	
-		model.set_sort_column_id(id(:modified), Gtk::SORT_DESCENDING)
+
+#		model.set_sort_column_id(id(:modified), :descending)
 	end	
 	
 end

data/bin/main/ProjectTree.rb

@@ -0,0 +1,25 @@
+
+class ProjectTree < VR::FileTreeView  #(change name)
+ 
+	attr_accessor :ftv
+
+	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 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

@@ -3,16 +3,16 @@ class RubygemsAPI
 
 	include GladeGUI
 
-	CREDENTIALS_FILE = ENV['HOME'] + "/.gem/credentials"
+	CREDENTIALS_FILE = File.join(ENV['HOME'], ".gem", "credentials")
 
 	def initialize
-		load_glade(__FILE__)
 		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
-
+  
 	def get_key()
 		if File.file?(CREDENTIALS_FILE)
 			return Gem.configuration.rubygems_api_key
@@ -28,17 +28,19 @@ class RubygemsAPI
 		@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") { |f| f.write(YAML.dump(obj)) }
+      			File.open(CREDENTIALS_FILE,"w",0600) { |f| f.write(YAML.dump(obj)) }
 					else
-						VR::Dialog.message_box(obj.values[0])
+						alert obj.values[0]
 					end 
 				end
 			end
@@ -56,19 +58,21 @@ class RubygemsAPI
 			return obj = YAML.load(response.body)	
     }
 	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
+
+
+# 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)
-    return unless key = get_key()
+    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.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.body = bod #must do it like this to close io ??!?!
     req.content_length = req.body.size
     @http.start() do |h|
       response = h.request(req)

data/bin/main/VR_ENV.rb

@@ -1,61 +1,39 @@
-
-class VR_ENV
-
-	include GladeGUI
-
+class VR_ENV 
+
+	include GladeGUI
+
 	SETTINGS_FILE = ".vr_settings.yaml"
-	SETTINGS_FILE_VERSION = 1
-
-	attr_accessor :width, :height, :panel_pos, :rdoc_command_line, :settings_file_version
-	attr_accessor :run_command_line, :open_files, :open_folders, :current_file
-
-
-	def initialize()
-		@settings_file_version = SETTINGS_FILE_VERSION
-		@width = 800
-		@height = 600
-		@panel_pos = 360
-		@run_command_line = "ruby main.rb"
-		@open_files = []
-		@open_folders = []
-		@current_file = ""
-		@rdoc_command_line = "rdoc -x README"
-		save_yaml()		
-	end
-
-	#todo validate
-	def buttonSave_clicked
-		get_glade_variables
-		save_yaml()
-		destroy_window()
-	end
-
-#	def buttonChooseFolder_clicked
-#		if folder = VR::Dialog.folder_box(@builder)
-#			if folder =~ /^#{Dir.pwd}\b/
-#				VR::Dialog.message_box("You must select a backup path outside the project's root folder.")
-#			else	
-#				@builder['backup_path'].text = folder
-#			end
-#		end	
-#	end
-
-	def self.load_yaml()
-		if File.file?(SETTINGS_FILE) 
-		 	me = YAML::load(File.open(SETTINGS_FILE).read)
-			return VR_ENV.new() if me.settings_file_version.nil?
-			return VR_ENV.new() if me.settings_file_version < SETTINGS_FILE_VERSION
-			return me 
-		else
-	  	VR_ENV.new()
-		end
-	end
-
-	def save_yaml()
-		data = YAML.dump(self)
-		File.open(Dir.pwd + "/" + SETTINGS_FILE, "w") {|f| f.puts(data)}
-		return self
-	end
-
-
-end
+
+	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		
+
+end
+
+

data/bin/main/VR_ENV_GLOBAL.rb

@@ -1,64 +1,65 @@
 
 class VR_ENV_GLOBAL
 		
-	GLOBAL_SETTINGS_FILE = File.join(ENV["HOME"], "visualruby", ".vr_global_settings")
-	SETTINGS_FILE_VERSION = 1
+	GLOBAL_SETTINGS_FILE = File.join(ENV["HOME"], "visualruby", ".global_settings.yaml")
 
 	include GladeGUI
 	
-	attr_accessor :browser, :tab_spaces, :glade_path
-	attr_accessor :font_name, :settings_file_version
-
-	def initialize
-		@settings_file_version = SETTINGS_FILE_VERSION
-		@browser = "firefox"
-		@tab_spaces = 2
-		@font_name = "Monospace 10"
-		@glade_path = "glade-gtk2"
-		save_yaml
+	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 before_show
-		@glade_box = VR::SimpleComboBoxEntry.new(@glade_path, "glade-gtk2", "glade", "glade-3", "C:\\Program Files (x86)\\Gtk+\\bin\\glade-3")
-		@builder["hboxGlade"].add(@glade_box) 
-		@browser_box = VR::SimpleComboBoxEntry.new(@browser, "xdg-open", "chromium-browser", "firefox", "google-chrome", "chrome", "chromium", "iexplore", "start iexplore", "start firefox", "start google-chrome", "start chrome", "start chromium", "C:\\Program Files\\iexplorer\\iexplore.exe")
-		@builder["hboxBrowser"].add(@browser_box)
+	def before_show
 		@builder["font_name"].show_size = true
 	end
-
-	#todo validate
-	def buttonSave_clicked
-		get_glade_variables
-		spaces = @builder['tab_spaces'].text.to_i
-		@tab_spaces = spaces if spaces > 0 and spaces < 9
-		@glade_path = @glade_box.active_text
-		@browser = @browser_box.active_text
-		save_yaml()
-		destroy_window()
+
+	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 save_yaml
-		data = YAML.dump(self)
-		File.open(GLOBAL_SETTINGS_FILE, "w") {|f| f.puts(data)}
+	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 self.load_yaml()
-		if File.file?(GLOBAL_SETTINGS_FILE) 
-		 	me = YAML::load(File.open(GLOBAL_SETTINGS_FILE).read)
-			return VR_ENV_GLOBAL.new() if me.settings_file_version.nil?
-			return VR_ENV_GLOBAL.new() if me.settings_file_version < SETTINGS_FILE_VERSION
-			return me 
-		else
-	  	VR_ENV_GLOBAL.new()
-		end
-	end
+	def buttonCancel__clicked(*args)
+		@builder["window1"].destroy
+	end		
 
-	def buttonTryGlade__clicked(*argv)
-		VR_Tools.popen(@glade_box.active_text)
+	def buttonTryGlade__clicked(*argv)
+		VR_Tools.popen(@glade_path)
 	end
 
-	def buttonTryBrowser__clicked(*argv)
-		VR_Tools.popen(@browser_box.active_text)
+	def buttonTryBrowser__clicked(*argv)
+		VR_Tools.popen(@browser)
+	end
+
+	def buttonCurrent__clicked(*argv)
+		@builder["default_project"].text = Dir.pwd
 	end
 
 end

data/bin/main/VR_File_Tree.rb

@@ -2,12 +2,13 @@
 class VR_File_Tree < VR::FileTreeView 
 
 	include GladeGUI
-
+  
 	def initialize(main, icon_path)
-		super(icon_path)
+		super(Dir.pwd,icon_path)
 		@main = main
 		@api = RubygemsAPI.new
-		load_glade(__FILE__)
+		load_glade()
+#		set_show_expanders(false)
   end
 
 	def self__row_activated(*args)
@@ -15,8 +16,10 @@ class VR_File_Tree < VR::FileTreeView
 		file_name = rows.first[:path]
     if File.extname(file_name) == ".glade" 
       VR_Tools.popen("#{$VR_ENV_GLOBAL.glade_path} #{file_name} ") 	
-		else
-			@main.tabs.load_tab(file_name) if not File.directory?(file_name)			
+		elsif File.directory?(file_name)	
+			expand_or_collapse_folder()
+		else
+			@main.tabs.load_tab(file_name) 		
 		end
 	end
 
@@ -40,7 +43,7 @@ class VR_File_Tree < VR::FileTreeView
 	end
 
 	def menuRDoc_clicked
-		return unless @main.tabs.try_to_save_all(false)
+		return unless @main.tabs.try_to_save_all(:ask => false)
 		fn = get_selected_path() 
 		old_dir = Dir.pwd
 		FileUtils.cd(fn)
@@ -53,20 +56,25 @@ class VR_File_Tree < VR::FileTreeView
 	end
 
 	def popBuildGem_clicked
-		file_name = get_selected_path()
-		@main.tabs.try_to_save_all(false)
-		gem_builder = "Invalid .gemspec file:  " + file_name
-		begin #try ruby 2.0.0 way first:
-			spec = Gem::Specification.load(file_name)
-			gem_builder = "Built Gem:\n" + Gem::Package.build(spec)
-		rescue #try old way
+		file_name = get_selected_path()
+		root = File.dirname(file_name)
+		unless root == Dir.pwd
+			alert("You must create gems from the root folder.")
+			return
+		end
+		@main.tabs.try_to_save_all(:ask => false)
+		gem_builder = "Loading .gemspec file:  " + file_name + "\n"
+		begin 
+      Gem::Specification.reset
 			spec = Gem::Specification.load(file_name)
-			b = Gem::Builder.new(spec)
-			b.build()
-			gem_builder = b.success()
+			gem_file_name = Gem::Package.build(spec)
+			gem_builder = gem_builder + "Built Gem:  " + gem_file_name + "\n"
+			gem_path = File.join(root, gem_file_name)
+			add_file(gem_path) if File.exists?(gem_path)
+		rescue
+      gem_builder = gem_builder + "Error: " + gem_file_name.to_s
 		end
-		@main.shell.buffer.text = gem_builder 
-		refresh()           
+		@main.shell.buffer.text = gem_builder          
 	end
 
   def popGlade_clicked
@@ -85,9 +93,9 @@ class VR_File_Tree < VR::FileTreeView
     else
       VR_Tools.popen("#{$VR_ENV_GLOBAL.glade_path} #{glade_file}")
     end
-  end
+  end
 
-  def self__button_release_event(w, event)					# right mouse button
+  def self__button_release_event(w, event)					# right click
     return unless path = get_selected_path() and event.button == 3
     if File.file?(path) and (File.extname(path) == ".rb" or File.extname(path) == "") 
     		@builder['popFile'].popup(nil, nil, event.button, event.time)
@@ -103,7 +111,7 @@ class VR_File_Tree < VR::FileTreeView
 	def self__key_press_event(view, evt)
 		return unless evt.keyval == 65535 #delete
 		return unless file_name = get_selected_path()
-		return unless VR::Dialog.ok_box("Delete: " + File.basename(file_name) + "?")
+		return unless alert("Delete:   <b>" + File.basename(file_name) + "</b> ?" , :button_yes => "Delete", :button_no=>"Cancel", :parent=>self, :headline => "Delete FIle?")  
   	if File.file?(file_name)
 			@main.tabs.destroy_file_tab(file_name)
   		File.delete(file_name)

data/bin/main/VR_Local_Gem_Tree.rb

@@ -6,8 +6,8 @@ class VR_Local_Gem_Tree < GemTree
 	def initialize(main)
 		super()
 		@main = main
-#		set_title(PIX => "Gems on this Computer")
-		load_glade(__FILE__)
+		load_glade()
+		parse_signals()
 	end
 	
 	def refresh()
@@ -19,11 +19,10 @@ class VR_Local_Gem_Tree < GemTree
 				add_row( :pix => RUBY_ICON, :gem => "#{gem} (#{v})" )
 			end
 		end
-	end
-
+	end
 
 	#todo
-	def popViewSpec_clicked; 
+	def popViewSpec_clicked
 		gem, ver = selected_gem()
 		spec = `gem specification #{gem} -v #{ver}`
 		@main.tabs.load_tab()
@@ -56,19 +55,6 @@ class VR_Local_Gem_Tree < GemTree
 	end
 
 
-#	def popUninstall_clicked
-#		gem, ver = selected_gem()
-#		#command = "gem uninstall " + gem_name.gsub("("," -x -v ").gsub(")","")
-#		command = "gem uninstall #{gem} -x -v '#{ver}' 2>&1" 		
-#		@main.shell.buffer.text = VR_Tools.sudo_command(command)
-#		refresh()
-#	end
-
-#	def get_name_ver(line)
-#		match = /^(.*)\s+\((.*)\)/.match(line)
-#		return match[1], match[2]
-#	end
-
 	def selected_gem
 		row = self.selection.selected[1].split(" (")
 		ver = row[1].gsub(")","")
@@ -77,4 +63,3 @@ class VR_Local_Gem_Tree < GemTree
 
 end
 
-