kgem 0.1.4 → 0.1.5

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
     s.name = "kgem"
-    s.version = "0.1.4"
+    s.version = "0.1.5"
     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.4"
+APP_VERSION = "0.1.5"
 
 
 # standard libs
@@ -42,6 +42,7 @@ require "previewwin"
 require "gemcmddlgs"
 require "gemviews"
 require "gemhelpdlg"
+require "gemsource"
 
 #--------------------------------------------------------------------
 #--------------------------------------------------------------------
@@ -117,9 +118,14 @@ class MainWindow < KDE::MainWindow
         settingsMenu.addAction(configureShortCutAction)
         settingsMenu.addAction(configureAppAction)
 
+        # source menu
+        sourceAction = @actions.addNew(i18n('Configure Gem Sources'), self, \
+            { :icon => 'repository', :shortCut => 'F12', :triggered => :configureSources })
+        sourceMenu = KDE::Menu.new(i18n('Sources'))
+        sourceMenu.addAction(sourceAction)
 
         # Help menu
-        aboutDlg = KDE::AboutApplicationDialog.new($about)
+        aboutDlg = KDE::AboutApplicationDialog.new(KDE::CmdLineArgs.aboutData)
         gemHelpAction = @actions.addNew(i18n('Gem Command Line Help'), self, \
             { :icon => 'help-about', :shortCut => 'F1', :triggered => :gemCommandHelp })
         openAboutAction = @actions.addNew(i18n('About kgem'), self, \
@@ -150,6 +156,7 @@ class MainWindow < KDE::MainWindow
         menu = KDE::MenuBar.new
         menu.addMenu( fileMenu )
         menu.addMenu( toolsMenu )
+        menu.addMenu( sourceMenu )
         menu.addMenu( settingsMenu )
         menu.addMenu( helpMenu )
         setMenuBar(menu)
@@ -246,12 +253,6 @@ class MainWindow < KDE::MainWindow
         @gemEnvDlg.displayEnv
     end
 
-    def openUrlDocument(url)
-        cmd= Mime::services('.html').first.exec
-        cmd.gsub!(/%\w+/, url)
-        fork do exec(cmd) end
-    end
-
     slots :configureShortCut
     def configureShortCut
         KDE::ShortcutsDialog.configure(@actions)
@@ -263,6 +264,12 @@ class MainWindow < KDE::MainWindow
         @settingsDlg.exec == Qt::Dialog::Accepted
     end
 
+    slots :configureSources
+    def configureSources
+        @gemSourceDlg ||= GemSourceDlg.new(self)
+        @gemSourceDlg.exec
+    end
+
     slots :gemCommandHelp
     def gemCommandHelp
         @gemHelpdlg.show
@@ -311,11 +318,11 @@ end
 #    main start
 #
 
-$about = KDE::AboutData.new(APP_NAME, nil, KDE::ki18n(APP_NAME), APP_VERSION,
+about = KDE::AboutData.new(APP_NAME, nil, KDE::ki18n(APP_NAME), APP_VERSION,
                             KDE::ki18n('Gem Utitlity with KDE GUI.')
                            )
-$about.addLicenseTextFile(APP_DIR + '/MIT-LICENSE')
-KDE::CmdLineArgs.init(ARGV, $about)
+about.addLicenseTextFile(APP_DIR + '/MIT-LICENSE')
+KDE::CmdLineArgs.init(ARGV, about)
 
 $app = KDE::Application.new
 args = KDE::CmdLineArgs.parsedArgs()

data/lib/downloadedwin.rb

@@ -163,7 +163,7 @@ class DownloadedWin < Qt::Widget
                 fGem = FetchedGem.new
                 fGem.fileName = f
                 fGem.directory = exDir
-                fGem.installed = InstalledGemList.checkVersionGemInstalled(f)
+                fGem.installed = InstalledGemList.checkVersionedGemInstalled(f)
                 fGem
             end
         end

data/lib/gemitem.rb

@@ -41,6 +41,7 @@ class GemItem
         @filePath = filePath
     end
 
+    # return versoin knowing newest, not latest.
     def nowVersion
         version.split(/,/, 2).first
     end
@@ -152,7 +153,7 @@ module InstalledGemList
         @gemList ||= get
     end
 
-    def checkVersionGemInstalled(versionedName)
+    def checkVersionedGemInstalled(versionedName)
         vname = versionedName.gsub(/\.gem$/, '')
         gem = getCached.find do |gem|
             gem.name + '-' + gem.version == vname

data/lib/gemsource.rb

@@ -0,0 +1,156 @@
+require 'set'
+
+class GemSourceDlg < Qt::Dialog
+    def initialize(parent=nil)
+        super(parent)
+        self.windowTitle = i18n('Gem sources')
+        createWidget
+    end
+
+    def createWidget
+        @sourceList = Qt::ListWidget.new
+        @rubygemsCheckBox = Qt::CheckBox.new(i18n('add rubygems source'))
+        connect(@rubygemsCheckBox, SIGNAL('stateChanged(int)'), self, \
+                SLOT('rubygemsStateChanged(int)'))
+        @githubCheckBox = Qt::CheckBox.new(i18n('add github source'))
+        connect(@githubCheckBox, SIGNAL('stateChanged(int)'), self, \
+                SLOT('githubStateChanged(int)'))
+        @addUrlLineEdit = KDE::LineEdit.new
+        @addBtn = KDE::PushButton.new(i18n('add'))
+        @deleteBtn = KDE::PushButton.new(i18n('delete'))
+        @okBtn = KDE::PushButton.new(KDE::Icon.new('dialog-ok'), i18n('Ok'))
+        @cancelBtn = KDE::PushButton.new(KDE::Icon.new('dialog-cancel'), i18n('Cancel'))
+        connect(@addBtn, SIGNAL(:clicked), self, SLOT(:addItem))
+        connect(@deleteBtn, SIGNAL(:clicked), self, SLOT(:deleteItem))
+        connect(@okBtn, SIGNAL(:clicked), self, SLOT(:accept))
+        connect(@cancelBtn, SIGNAL(:clicked), self, SLOT(:reject))
+
+        # layout
+        lo = Qt::VBoxLayout.new do |l|
+            l.addWidget(@sourceList)
+            l.addWidget(@rubygemsCheckBox)
+            l.addWidget(@githubCheckBox)
+            l.addWidgets(@deleteBtn, nil)
+            l.addWidgets(@addBtn, @addUrlLineEdit)
+            l.addWidgets(nil, @okBtn, @cancelBtn)
+            l.addStretch
+        end
+        setLayout(lo)
+    end
+
+    UrlRegexp = URI.regexp(['http', 'https'])
+    GithubUrl = 'http://gems.github.com'
+    RubygemsUrl = 'http://rubygems.org/'
+    SystemUrls = [ GithubUrl, RubygemsUrl ]
+    def updateSources
+        @sourceList.clear
+        @sourceUrls = {}
+        @rubygemsCheckBox.checked = false
+        @githubCheckBox.checked = false
+        %x{ gem sources -l }.split(/\n/).each do |line|
+            url = line[UrlRegexp]
+            if url then
+                case url
+                when RubygemsUrl
+                    @rubygemsCheckBox.checked = true
+                when GithubUrl
+                    @githubCheckBox.checked = true
+                else
+                    @sourceUrls[url] = item = Qt::ListWidgetItem.new(url)
+                    @sourceList.addItem(item)
+                end
+            end
+        end
+        @orgUrls = Set.new(@sourceUrls.keys)
+    end
+
+    def addUrl(url)
+        unless @sourceUrls[url] then
+            @sourceUrls[url] = item = Qt::ListWidgetItem.new(url)
+            @sourceList.addItem(item)
+        end
+    end
+
+    def deleteUrl(url)
+        if @sourceUrls[url] then
+            row = @sourceList.row(@sourceUrls[url])
+            @sourceList.takeItem(row)
+#             @sourceList.removeItemWidget(@sourceUrls[url]) # cannot use ?
+            @sourceUrls.delete(url)
+        end
+    end
+
+    slots :addItem
+    def addItem
+        url = @addUrlLineEdit.text.strip
+        case url
+        when RubygemsUrl
+            @rubygemsCheckBox.checked = true
+        when GithubUrl
+            @githubCheckBox.checked = true
+        else
+            unless url.empty? or @sourceUrls.has_key?(url) then
+                addUrl(url)
+            end
+        end
+    end
+
+    slots :deleteItem
+    def deleteItem
+        row = @sourceList.currentRow
+        return unless row >= 0
+        case @sourceList.item(row).text
+        when RubygemsUrl
+            @rubygemsCheckBox.checked = false
+        when GithubUrl
+            @githubCheckBox.checked = false
+        else
+            @sourceList.takeItem(row)
+        end
+    end
+
+    #-----------------
+    def exec
+        updateSources
+        super
+    end
+
+    slots 'githubStateChanged(int)'
+    def githubStateChanged(state)
+        if state == Qt::Checked then
+            addUrl(GithubUrl)
+        else
+            deleteUrl(GithubUrl)
+        end
+    end
+
+    slots 'rubygemsStateChanged(int)'
+    def rubygemsStateChanged(state)
+        if state == Qt::Checked then
+            addUrl(RubygemsUrl)
+        else
+            deleteUrl(RubygemsUrl)
+        end
+    end
+
+    # overwrite virtual method
+    def accept
+        msg = ""
+        newUrls = Set.new(@sourceUrls.keys)
+        deletes =  @orgUrls - newUrls
+        deletes.each do |url|
+            msg += "delete #{url}\n"
+            %x{ gem sources --remove #{url} }
+        end
+
+        adds =  newUrls - @orgUrls
+        adds.each do |url|
+            msg += "add #{url}\n"
+            %x{ gem sources --add #{url} }
+        end
+        unless msg.empty? then
+            KDE::MessageBox.information(self, msg)
+        end
+        super
+    end
+end

data/lib/gemviews.rb

@@ -273,14 +273,13 @@ Pristine All ?
         @gemPath ||= %x{gem environment gempath}.chomp.split(/:/)
     end
 
-    def findGemPath(path)
+    def findGemPath(relPath)
         paths = getGemPaths
-        file = nil
-        paths.find do |p|
-            file = p + path
-            File.exist? file
+        path = paths.find do |pa|
+            File.exist? pa + relPath
         end
-        file
+        return nil unless path
+        path + relPath
     end
 
     def viewGemRdoc(gem)
@@ -290,9 +289,7 @@ Pristine All ?
         pkg = gem.package
         ver = gem.nowVersion
         url = findGemPath('/doc/' + pkg + '-' + ver + '/rdoc/index.html')
-        cmd= Mime::services('.html').first.exec
-        cmd.gsub!(/%\w+/, url)
-        fork do exec(cmd) end
+        openUrlDocument(url)
     end
 
     def viewGemDir(gem)
@@ -301,9 +298,7 @@ Pristine All ?
         pkg = gem.package
         ver = gem.nowVersion
         url = findGemPath('/gems/' + pkg + '-' + ver)
-        cmd = KDE::MimeTypeTrader.self.query('inode/directory').first.exec[/\w+/]
-        cmd += " " + url
-        fork do exec(cmd) end
+        openDirectory(url)
     end
 end
 

data/lib/mylibs.rb

@@ -119,12 +119,10 @@ end
 #  Mandriva doesn't include kio smoke library.
 #   FolderSelectorLineEdit substitute KDE::UrlRequester
 #
-class FolderSelectorLineEdit< Qt::Widget
+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
@@ -407,11 +405,19 @@ end
 #
 #
 def openDirectory(dir)
+    return if !dir or dir.empty?
     cmd = KDE::MimeTypeTrader.self.query('inode/directory').first.exec[/\w+/]
     cmd += " " + dir
     fork do exec(cmd) end
 end
 
+def openUrlDocument(url)
+    return if !url or url.empty?
+    cmd = Mime::services('.html').first.exec
+    cmd.gsub!(/%\w+/, url)
+    fork do exec(cmd) end
+end
+
 #--------------------------------------------------------------------------
 #
 #   stdlib

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgem
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - ruby.twiddler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +09:00
+date: 2010-09-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,19 +47,20 @@ extensions:
 extra_rdoc_files: 
 - README
 files: 
-- bin/gemcmdwin.rb
 - bin/kgem.rb
+- bin/gemcmdwin.rb
 - bin/gemcmdwin-super.rb
+- lib/downloadedwin.rb
+- lib/gemhelpdlg.rb
+- lib/gemviews.rb
 - lib/searchwin.rb
+- lib/installedwin.rb
 - lib/mylibs.rb
+- lib/previewwin.rb
+- lib/gemsource.rb
+- lib/settings.rb
 - lib/gemitem.rb
-- lib/gemviews.rb
-- lib/installedwin.rb
-- lib/downloadedwin.rb
 - lib/gemcmddlgs.rb
-- lib/settings.rb
-- lib/gemhelpdlg.rb
-- lib/previewwin.rb
 - README
 - MIT-LICENSE
 - Rakefile