Merge branch 'develop' of project.glenux.net:qasim into develop

Conflicts:
	Gemfile

.gitignore

@@ -11,3 +11,20 @@ debian/qasim/
 *_qrc.rb
 .bundle
 vendor/bundle
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

Gemfile

@@ -1,8 +1,9 @@
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
+# Specify your gem's dependencies in qasim.gemspec
+gemspec
 
-gem "rdebug"
+#gem "rdebug"
+#gem "qtbindings"
 #gem "qtbindings", "~> 4.8.3.0"
-gem "qtbindings"
+#gem "thor"
-gem "thor"
-

README.md

@@ -23,10 +23,36 @@ or
     apt-get install ruby-qt4
 
 
-Alternatives
+Installation
 ------------
 
-* [Mountoid](http://kde-apps.org/content/show.php/Mountoid?content=115943)
+Add this line to your application's Gemfile:
+
+    gem 'qasim'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install qasim
+
+
+Usage
+-----
+
+TODO: Write usage instructions here
+
+
+Contributing
+------------
+
+1. Fork it ( http://github.com/glenux/qasim/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
 
 Copyright & License
@@ -47,3 +73,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+Alternatives
+------------
+
+* [Mountoid](http://kde-apps.org/content/show.php/Mountoid?content=115943)
+

Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

TODO.md

@@ -21,3 +21,8 @@ Global SSHFS Options
 
 ssh_command='autossh -M 0'
 
+
+Fixes
+
+Use Rakefile
+ex: https://github.com/ryanmelt/qtbindings/blob/master/Rakefile

debian/copyright

@@ -1,17 +1,15 @@
 This package was debianized by Glenn ROLLAND <glenux@glenux.net> on
 Sat, 15 Mar 2008 17:11:00 +0100.
 
-It was downloaded from <url://example.com>
+It was downloaded from http://glenux.github.io/qasim
 
 Upstream Author(s): 
 
-    <put author's name and email here>
+    Glenn Y. Rolland <glenux@glenux.net>
-    <likewise for another author>
 
 Copyright: 
 
-    <Copyright (C) YYYY Name OfAuthor>
+    Copyright (C) 2008-2014 Glenn Y. Rolland
-    <likewise for another author>
 
 License:
 

lib/qasim.rb

@@ -1,5 +1,6 @@
 
 
+require 'qasim/version'
 require 'qasim/constants'
 
 module Qasim

lib/qasim/constants.rb

@@ -1,8 +1,5 @@
 module Qasim
 	APP_ICON_PATH = File.join QASIM_DATA_DIR, "icons"
-	APP_NAME = "Qasim"
-	APP_VERSION = "0.1"
-	APP_DATE = "2012-08-02"
 
 	APP_SYSCONFIG_DIR = "/etc/qasim/maps.d"
 

lib/qasim/version.rb

@@ -0,0 +1,5 @@
+module Qasim
+	APP_NAME = "Qasim"
+	APP_VERSION = "0.1"
+	APP_DATE = "2012-08-02"
+end

qasim.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'qasim/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "qasim"
+  spec.version       = Qasim::APP_VERSION
+  spec.authors       = ["Glenn Y. Rolland"]
+  spec.email         = ["glenux@glenux.net"]
+  spec.summary       = %q{Easy mount solution for SSH filesystems.}
+  spec.description   = %q{Qasim is a front-end for sshfs, the filesystem
+	client based on fuse and ssh. It provides automating and global settings
+    control for sshfs mounts.}
+  spec.homepage      = "http://glenux.github.io/qasim"
+  spec.license       = "GPL-3"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+end