gloudapp 1.1.1 → 1.2.0

data/README.md

@@ -5,9 +5,11 @@ GloudApp is a [CloudApp](http://getcloudapp.com/) client for Linux and
 [GNOME2](http://www.gnome.org/) based on GTK using the
 [Ruby-GNOME2](http://ruby-gnome2.sourceforge.jp/) bindings.
 
-It hat equivalent features as the official OSX client allowing you
-to take and upload screenshots with only a single click and other
-files through a file chooser dialog.
+It is the equivalent to the official OSX client allowing you
+to take and upload screenshots with only a single click and
+other files through a file chooser dialog.
+
+**[Works with regenwolken](https://github.com/posativ/regenwolken)**
 
 Install
 -------
@@ -15,17 +17,16 @@ Install
 Header files needed to build native gem extensions for gtk2 gem and dependencies
 (distribution specific package names; here: Ubuntu 11.04):
 
-- libgdk-pixbuf2.0-dev
-- libglib2.0-dev
-- libatk1.0-dev
-- libgtk2.0-dev
-- libpango1.0-dev
+	libgdk-pixbuf2.0-dev libglib2.0-dev libatk1.0-dev libgtk2.0-dev libpango1.0-dev
 
 Then install the gloudapp gem:
 
-	sudo gem install gloudapp
+	gem install gloudapp
 
-(If you use [rvm](http://beginrescueend.com/) you should omit the 'sudo'.)
+If you do not use [rvm](http://beginrescueend.com/) you should add an 'sudo'
+but rvm ist strongly recommended because some 
+[linux distributions](https://bugs.launchpad.net/ubuntu/+source/gems/+bug/145267) 
+do not add rubygem binaries to PATH)
 
 Usage
 -----
@@ -33,13 +34,20 @@ Usage
 You could launch gloudapp (or place it in auto-start) via:
 
 	gloudapp
+	
+If this does not work and you are not using rvm think about using it. If you 
+really do not want to use rvm you may have to add rubygem binaries to your 
+PATH by adding `/var/lib/gems/1.8/bin` (depending on your system) to your PATH,
+e.g. for Ubuntu 11.04 (into *~/.profile*):
+
+	PATH="$PATH:/var/lib/gems/1.8/bin"
 
-Then you will be prompted to provide your credentials (or not if you're already
+You will be prompted to enter your credentials (or not if you're already
 using [cloudapp-cli](https://github.com/cmur2/cloudapp-cli) on the same machine).
 A successful login gives you a new small but fine icon right in your notification bar
 which is sensitive for left clicking (take screenshot and upload) and right clicking
-(offering a popup menu with all other commands). After an upload the new URL will
-appear immediately be copied into the clipboard for easily pasting it somewhere.
+(offering a popup menu with all other commands). After an upload the new URL
+gets copied to the clipboard automatically for easily pasting it somewhere.
 Have fun!
 
 Thanks

data/gloudapp.gemspec

@@ -4,24 +4,24 @@ $:.push File.expand_path("../lib", __FILE__)
 require "gloudapp/info"
 
 Gem::Specification.new do |s|
-  s.name        = "gloudapp"
-  s.version     = GloudApp::Info::VERSION
-  s.authors     = GloudApp::Info::AUTHORS.map { |author| author[0] }
-  s.email       = GloudApp::Info::AUTHORS.map { |author| author[1] }
-  s.homepage    = GloudApp::Info::HOMEPAGE
-  s.summary     = GloudApp::Info::SUMMARY
-  #s.description = %q{CloudApp client for GNOME/GTK}
+	s.name        = "gloudapp"
+	s.version     = GloudApp::Info::VERSION
+	s.authors     = GloudApp::Info::AUTHORS.map { |author| author[0] }
+	s.email       = GloudApp::Info::AUTHORS.map { |author| author[1] }
+	s.homepage    = GloudApp::Info::HOMEPAGE
+	s.summary     = GloudApp::Info::SUMMARY
+	#s.description = %q{CloudApp client for GNOME/GTK}
 
-  s.rubyforge_project = "gloudapp"
+	s.rubyforge_project = "gloudapp"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+	s.files         = `git ls-files`.split("\n")
+	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+	s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+	s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "cloudapp_api"
-  s.add_runtime_dependency "gtk2"
-  s.add_runtime_dependency "json"
+	# specify any dependencies here; for example:
+	# s.add_development_dependency "rspec"
+	s.add_runtime_dependency "cloudapp_api"
+	s.add_runtime_dependency "gtk2"
+	s.add_runtime_dependency "json"
 end

data/lib/gloudapp/info.rb

@@ -1,6 +1,6 @@
 module GloudApp
 	module Info
-		VERSION = "1.1.1"
+		VERSION = "1.2.0"
 		AUTHORS = [
 			["Christian Nicolai", "chrnicolai@gmail.com"],
 			["Jan Graichen", "jan.graichen@altimos.de"]
@@ -9,8 +9,8 @@ module GloudApp
 			["Jan Graichen", "jan.graichen@altimos.de"]
 		]
 		HOMEPAGE = "https://github.com/cmur2/gloudapp"
-		SUMMARY = "CloudApp client for GNOME/GTK"
+		SUMMARY = "CloudApp (tm) applet for Gnome/GTK2"
 		COPYRIGHT = "Copyright 2011 GloudApp Team"
 		LICENSE = "Apache License, Version 2.0"
 	end
-end
+end

data/lib/gloudapp/patches.rb

@@ -28,4 +28,4 @@ module CloudApp
 			}
 		end
 	end
-end
+end

data/lib/gloudapp.rb

@@ -13,17 +13,7 @@ module GloudApp
 		def initialize
 			@client = CloudApp::Client.new
 
-			@credentials = load_credentials
-			@client.authenticate(@credentials[:username], @credentials[:password])
-
-			if not credentials_valid?
-				@credentials = request_credentials
-				@client.authenticate(@credentials[:username], @credentials[:password])
-			end
-
-			if not credentials_valid?
-				ErrorDialog.run!("Error", "Authentication failed!")
-			end
+			login!
 
 			create_tray
 		end
@@ -33,6 +23,42 @@ module GloudApp
 			Gtk.main
 		end
 
+		def login!
+			if ARGV.length == 2
+				# assume that's username and password in ARGV
+				@credentials = {:username => ARGV[0], :password => ARGV[1]}
+				@client.authenticate(@credentials[:username], @credentials[:password])
+				return if credentials_valid?
+				ErrorDialog.run!("GloudApp - Error", "Authentication failed!")
+				exit 1
+			end
+
+			default_remember = false
+
+			@credentials = load_credentials('.gloudapp')
+			if not @credentials.nil?
+				@client.authenticate(@credentials[:username], @credentials[:password])
+				return if credentials_valid?
+				# make the login dialog remember the new credentials by default
+				# since the old ones in .gloudapp are wrong
+				default_remember = true
+			else
+				@credentials = load_credentials('.cloudapp-cli')
+				if not @credentials.nil?
+					@client.authenticate(@credentials[:username], @credentials[:password])
+					return if credentials_valid?
+				end
+			end
+
+			@credentials = request_credentials(default_remember)
+			if not @credentials.nil?
+				@client.authenticate(@credentials[:username], @credentials[:password])
+				return if credentials_valid?
+			end
+			ErrorDialog.run!("GloudApp - Error", "Authentication failed!")
+			exit 1
+		end
+
 		def credentials_valid?
 			# check whether auth was successful
 			@acc = CloudApp::Account.find
@@ -42,26 +68,22 @@ module GloudApp
 			return false
 		end
 
-		def load_credentials
-			if ARGV.length == 2
-				# assume that's username and password in ARGV
-				return {:username => ARGV[0], :password => ARGV[1]}
-			end
-
-			@config_file = File.join(ENV['HOME'], '.cloudapp-cli')
-			if File.exists?(@config_file)
-				creds = YAML.load_file(@config_file)
-				return creds unless creds[:username].nil? or creds[:password].nil?
+		def load_credentials(name)
+			config_file = File.join(ENV['HOME'], name)
+			if File.exists?(config_file)
+				return YAML.load_file(config_file)
 			end
-
-			request_credentails
+			nil
 		end
 
-		def request_credentials
-			login_dlg = LoginDialog.new
+		def request_credentials(default_remember)
+			login_dlg = LoginDialog.new(default_remember)
 			case login_dlg.run
 			when Gtk::Dialog::RESPONSE_ACCEPT
 				creds = {:username => login_dlg.login.text, :password => login_dlg.password.text}
+				if login_dlg.remember.active?
+					File.open(File.join(ENV['HOME'], '.gloudapp'), 'w+') do |f| YAML.dump(creds, f) end
+				end
 				login_dlg.destroy
 				return creds
 			when Gtk::Dialog::RESPONSE_REJECT
@@ -89,7 +111,7 @@ module GloudApp
 				:action => Proc.new { upload_from_clipboard }
 
 			# upload file via file chooser
-			@tray.add_action("Upload file") { upload_via_chooser }
+			@tray.add_action("Upload...") { upload_via_chooser }
 
 			# show about dialog
 			@tray.add_action("About", :no_icon_change => true) { GloudApp::AboutDialog.run! }
@@ -117,7 +139,7 @@ module GloudApp
 			# on popup menu creation...
 			with_clipboard_text do |text|
 				if !text.nil?
-					puts "Uploading file from clipboard..."
+					#puts "Uploading file from clipboard..."
 					upload_file(text)
 				end
 			end
@@ -177,9 +199,9 @@ module GloudApp
 
 		def upload_file(file)
 			if File.file?(file)
-				puts "Uploading #{file}"
+				#puts "Uploading #{file}"
 				drop = @client.upload(file)
-				puts "URL (in clipboard, too): #{drop.url}"
+				#puts "URL (in clipboard, too): #{drop.url}"
 				# copy URL to clipboard
 				self.clipboard_text = drop.url
 				@last_drop = drop
@@ -191,7 +213,7 @@ module GloudApp
 
 		def take_screenshot
 			file = File.join(TMP_DIR, "Screenshot #{Time.now.strftime(SCRN_TIME_FMT)}.png")
-			puts "Taking screenshot..."
+			#puts "Taking screenshot..."
 			# TODO: find rubish way to take screen shots
 			# make screenshot via image magick:
 			system("import -window root \"#{file}\"")
@@ -204,7 +226,7 @@ module GloudApp
 
 		def error(message)
 			options = {:message => message} unless message.is_a?(Hash)
-			options = {:title => 'Error'}.merge(options)
+			options = {:title => 'GloudApp - Error'}.merge(options)
 
 			@tray.icon = Icon.error
 			@tray.message = options[:message]
@@ -351,9 +373,9 @@ module GloudApp
   end
 
   class LoginDialog < Gtk::Dialog
-		attr_reader :login, :password
+		attr_reader :login, :password, :remember
 
-		def initialize
+		def initialize(default_remember = false)
 			super("Authentication",
 				nil,
 				Gtk::Dialog::MODAL,
@@ -364,6 +386,8 @@ module GloudApp
 
 			@login = Gtk::Entry.new
 			@password = Gtk::Entry.new.set_visibility(false)
+			@remember = Gtk::CheckButton.new('Remember login')
+			@remember.active = default_remember
 			image = Gtk::Image.new(Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::IconSize::DIALOG)
 
 			table = Gtk::Table.new(2, 3).set_border_width(5)
@@ -372,6 +396,7 @@ module GloudApp
 			table.attach_defaults(@login, 2, 3, 0, 1)
 			table.attach_defaults(Gtk::Label.new("Password:").set_xalign(1).set_xpad(5), 1, 2, 1, 2)
 			table.attach_defaults(@password, 2, 3, 1, 2)
+			table.attach_defaults(@remember, 2, 3, 2, 3)
 
 			self.vbox.add(table)
 			self.show_all

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gloudapp
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 31
+  prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-28 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cloudapp_api
@@ -85,6 +86,7 @@ files:
 - lib/gloudapp/icons/gloudapp_working.png
 - lib/gloudapp/info.rb
 - lib/gloudapp/patches.rb
+has_rdoc: true
 homepage: https://github.com/cmur2/gloudapp
 licenses: []
 
@@ -114,9 +116,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gloudapp
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: CloudApp client for GNOME/GTK
+summary: CloudApp (tm) applet for Gnome/GTK2
 test_files: []