kgem 0.1.0 → 0.1.1

data/README

@@ -18,7 +18,7 @@ just type gem command.
   gem install kgem
 
 or download latest gems from github and rake to install gem.
-  git clone git@github.com:rubytwiddler/kgem.git
+  git clone git://github.com/rubytwiddler/kgem.git
   cd kgem
   rake gem
   sudo rake installgem

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
     s.name = "kgem"
-    s.version = "0.1.0"
+    s.version = "0.1.1"
     s.author = "ruby.twiddler"
     s.email = "ruby.twiddler at gmail.com"
     s.homepage = "http://github.com/rubytwiddler/kgem/wiki"

data/bin/kgem.rb

@@ -12,7 +12,7 @@ APP_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 APP_NAME = File.basename(APP_FILE).sub(/\.rb/, '')
 APP_DIR = File::dirname(File.expand_path(File.dirname(APP_FILE)))
 LIB_DIR = File::join(APP_DIR, "lib")
-APP_VERSION = "0.1.0"
+APP_VERSION = "0.1.1"
 
 
 # standard libs

data/lib/downloadedwin.rb

@@ -154,6 +154,7 @@ class DownloadedWin < Qt::Widget
     slots :updateList
     def updateList
         def allFilesInDir(dir)
+            return [] unless dir
             exDir = File.expand_path(dir)
             return [] unless File.directory?(exDir)
             Dir.chdir(exDir)
@@ -167,7 +168,7 @@ class DownloadedWin < Qt::Widget
             end
         end
 
-        dirs = GemDirs + [ Settings.autoFetchDir.pathOrUrl ]
+        dirs = GemDirs + [ Settings.autoFetchDir ]
         gems = dirs.uniq.inject([]) do |res, dir|
             res + allFilesInDir(dir)
         end
@@ -238,7 +239,7 @@ class DownloadedWin < Qt::Widget
         fetchedGem = @gemFileList.currentGem
         fileName = fetchedGem.filePath
         if Settings.autoUnpackFlag then
-            dir = Settings.autoUnpackDir.pathOrUrl
+            dir = Settings.autoUnpackDir
         else
             dir = KDE::FileDialog::getExistingDirectory(Settings.autoUnpackDir)
             return unless dir

data/lib/gemviews.rb

@@ -237,7 +237,7 @@ Pristine All ?
         return unless @selectDownloadVerDlg.selectVersion(gem)
 
         if Settings.autoFetchFlag then
-            dir = Settings.autoFetchDir.pathOrUrl
+            dir = Settings.autoFetchDir
         else
             dir = KDE::FileDialog::getExistingDirectory(Settings.autoFetchDir)
             return unless dir

data/lib/mylibs.rb

@@ -114,6 +114,59 @@ def passiveMessage(text)
 end
 
 
+#--------------------------------------------------------------------------
+#
+#  Mandriva doesn't include kio smoke library.
+#   FolderSelectorLineEdit substitute KDE::UrlRequester
+#
+class FolderSelectorLineEdit< Qt::Widget
+    def initialize(dir=nil, parent=nil)
+        super(parent)
+
+#         setContentsMargins(0,0,0,0)
+
+        # widgets
+        @lineEdit = KDE::LineEdit.new
+        @lineEdit.text = dir if dir
+        @dirSelectBtn = KDE::PushButton.new(KDE::Icon.new('folder'),'')
+
+        # connect
+        connect(@dirSelectBtn, SIGNAL(:clicked), self, SLOT(:openSelectDlg))
+
+        # layout
+        lo = Qt::HBoxLayout.new do |l|
+            l.setContentsMargins(0,0,0,0)
+            l.addWidgets(@lineEdit, @dirSelectBtn)
+        end
+        setLayout(lo)
+    end
+
+    slots :openSelectDlg
+    def openSelectDlg
+        path = Qt::FileDialog::getExistingDirectory(self,'select folder', @lineEdit.text)
+        unless !path || path.empty?
+            @lineEdit.text = path
+        end
+    end
+
+    # for settings manager.
+    def objectName=(name)
+        @lineEdit.objectName = name
+    end
+
+    def folder
+        @LineEdit.text
+    end
+    # compatibility for UrlRequester
+    alias text folder
+
+    def folder=(dir)
+        @LineEdit.text = dir
+    end
+end
+
+
+
 
 #--------------------------------------------------------------------------
 #
@@ -313,6 +366,8 @@ class SettingsBase < KDE::ConfigSkeleton
                         o.checked = val
                     elsif o.kind_of? Qt::ComboBox
                         o.currentIndex = val
+                    elsif o.kind_of? KDE::LineEdit
+                        o.text = val
                     elsif o.kind_of? KDE::UrlRequester
                         o.setUrl(val)
                     end
@@ -334,6 +389,8 @@ class SettingsBase < KDE::ConfigSkeleton
                         end
                     elsif o.kind_of? Qt::ComboBox
                         options.send(name, o.currentIndex)
+                    elsif o.kind_of? KDE::LineEdit
+                        options.send(name, o.text)
                     elsif o.kind_of? KDE::UrlRequester
                         options.send(name, o.url)
                     else

data/lib/settings.rb

@@ -16,10 +16,10 @@ class Settings < SettingsBase
 
         # folder settings.
         addBoolItem(:autoFetchFlag, false)
-        addUrlItem(:autoFetchDir,
+        addStringItem(:autoFetchDir,
                    File.join(KDE::GlobalSettings.downloadPath, 'gem_cache'))
         addBoolItem(:autoUnpackFlag, false)
-        addUrlItem(:autoUnpackDir, File.join(KDE::GlobalSettings.downloadPath, 'gem_src'))
+        addStringItem(:autoUnpackDir, File.join(KDE::GlobalSettings.downloadPath, 'gem_src'))
         addBoolItem(:installLatestFlag, false)
         addBoolItem(:downloadLatestFlag, false)
 
@@ -51,16 +51,14 @@ class GeneralSettingsPage < Qt::Widget
 
     def createWidget
         @autoFetchCheckBox = Qt::CheckBox.new(i18n("Always Download gem in same directory."))
-        @downloadUrl = KDE::UrlRequester.new(KDE::Url.new())
+        @downloadUrl = FolderSelectorLineEdit.new
         @downloadUrl.enabled = false
-        @downloadUrl.mode = KDE::File::Directory | KDE::File::LocalOnly
         connect(@autoFetchCheckBox, SIGNAL('stateChanged(int)'),
                 self, SLOT('autoFetchChanged(int)'))
 
         @autoUnpackCheckBox = Qt::CheckBox.new(i18n("Always Unpack gem in same directory."))
-        @unpackUrl = KDE::UrlRequester.new(KDE::Url.new())
+        @unpackUrl = FolderSelectorLineEdit.new
         @unpackUrl.enabled = false
-        @unpackUrl.mode = KDE::File::Directory | KDE::File::LocalOnly
         connect(@autoUnpackCheckBox, SIGNAL('stateChanged(int)'),
                 self, SLOT('autoUnpackChanged(int)'))
         @installLatestCheckBox = Qt::CheckBox.new(i18n("Always Install latest version to skip version selection."))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgem
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - ruby.twiddler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +09:00
+date: 2010-09-14 00:00:00 +09:00
 default_executable: 
 dependencies: []