Piggy 0.5.1.2 → 0.5.1.3

data/CHANGES.txt

@@ -1,3 +1,9 @@
+Changes in 0.5.1-3
+- Bugfix: find LOCALAPPDATA and MYPICTURES
+  -> in mingw build
+  -> without win::dir
+- require gem fxruby in gemspec
+
 Changes in 0.5.1-2
 - Save/load album list with comment and rotations
 - Separate width option for widescreen images
@@ -14,6 +20,7 @@ Changes in 0.5.1-1
 - New style: snowman
 - New style: candle
 - New style: snow
+
 Changes in 0.5.1-0
 - Sort by time of photo creation before generation
   (includes workaround for missing time information)

data/lib/piggy-core/version.rb

@@ -4,7 +4,7 @@
 # Provide release information for Piggy.
 module PiggyVersion
   def PiggyVersion.version_string
-    '0.5.1-2'
+    '0.5.1-3'
   end
   def PiggyVersion.copyright_string
     'Copyright (C) 2010 Sascha D�rdelmann'

data/lib/piggy-core/winshell.rb

@@ -129,61 +129,75 @@ class WinShell < ShellInterface
   include Singleton
 end
 
-if RUBY_PLATFORM =~ /win32/
+if RUBY_PLATFORM =~ /win32/ or RUBY_PLATFORM =~ /mingw32/
   require 'win32ole'
-  require 'win32/dir'
-  
+
   class WinShell < ShellInterface
     
     def initialize
       @shell = WIN32OLE.new('Shell.application')
-      @os_paths = {
-        "ALTSTARTUP" => Dir::ALTSTARTUP,
-        "APPDATA" => Dir::APPDATA,
-        "COMMONALTSTARTUP" => Dir::COMMON_ALTSTARTUP,
-        "COMMONAPPDATA" => Dir::COMMON_APPDATA,
-        "COMMONDESKTOPDIR" => Dir::COMMON_DESKTOPDIRECTORY,
-        "COMMONFAVORITES" => Dir::COMMON_FAVORITES,
-        "COMMONPROGRAMS" => Dir::COMMON_PROGRAMS,
-        "COMMONSTARTMENU" => Dir::COMMON_STARTMENU,
-        "COMMONSTARTUP" =>Dir::COMMON_STARTUP,
-        "COOKIES" => Dir::COOKIES,
-        "DESKTOP" => Dir::DESKTOP,
-        "DESKTOPDIRECTORY" => Dir::DESKTOPDIRECTORY,
-        "FAVORITES" => Dir::FAVORITES,
-        "FONTS" => Dir::FONTS,
-        "HISTORY" => Dir::HISTORY,
-        "INTERNETCACHE" => Dir::INTERNET_CACHE,
-        "LOCALAPPDATA" => Dir::LOCAL_APPDATA,
-        "MYPICTURES" => Dir::MYPICTURES,
-        "NETHOOD" => Dir::NETHOOD,
-        "PERSONAL" => Dir::PERSONAL,
-        "PRINTHOOD" => Dir::PRINTHOOD,
-        "PROFILE" => Dir::PROFILE,
-        "PROGRAMFILES" => Dir::PROGRAM_FILES,
-        "PROGRAMS" => Dir::PROGRAMS,
-        "RECENT" => Dir::RECENT,
-        "SENDTO" => Dir::SENDTO,
-        "STARTMENU" => Dir::STARTMENU,
-        "STARTUP" => Dir::STARTUP,
-        "SYSTEM" => Dir::SYSTEM,
-        "TEMPLATES" => Dir::TEMPLATES,
-        "WINDOWS" => Dir::WINDOWS
-      }
+      begin
+        require 'win32/dir'
+        @os_paths = {
+          "ALTSTARTUP" => Dir::ALTSTARTUP,
+          "APPDATA" => Dir::APPDATA,
+          "COMMONALTSTARTUP" => Dir::COMMON_ALTSTARTUP,
+          "COMMONAPPDATA" => Dir::COMMON_APPDATA,
+          "COMMONDESKTOPDIR" => Dir::COMMON_DESKTOPDIRECTORY,
+          "COMMONFAVORITES" => Dir::COMMON_FAVORITES,
+          "COMMONPROGRAMS" => Dir::COMMON_PROGRAMS,
+          "COMMONSTARTMENU" => Dir::COMMON_STARTMENU,
+          "COMMONSTARTUP" =>Dir::COMMON_STARTUP,
+          "COOKIES" => Dir::COOKIES,
+          "DESKTOP" => Dir::DESKTOP,
+          "DESKTOPDIRECTORY" => Dir::DESKTOPDIRECTORY,
+          "FAVORITES" => Dir::FAVORITES,
+          "FONTS" => Dir::FONTS,
+          "HISTORY" => Dir::HISTORY,
+          "INTERNETCACHE" => Dir::INTERNET_CACHE,
+          "LOCALAPPDATA" => Dir::LOCAL_APPDATA,
+          "MYPICTURES" => Dir::MYPICTURES,
+          "NETHOOD" => Dir::NETHOOD,
+          "PERSONAL" => Dir::PERSONAL,
+          "PRINTHOOD" => Dir::PRINTHOOD,
+          "PROFILE" => Dir::PROFILE,
+          "PROGRAMFILES" => Dir::PROGRAM_FILES,
+          "PROGRAMS" => Dir::PROGRAMS,
+          "RECENT" => Dir::RECENT,
+          "SENDTO" => Dir::SENDTO,
+          "STARTMENU" => Dir::STARTMENU,
+          "STARTUP" => Dir::STARTUP,
+          "SYSTEM" => Dir::SYSTEM,
+          "TEMPLATES" => Dir::TEMPLATES,
+          "WINDOWS" => Dir::WINDOWS
+        }
+      rescue LoadError => load_error
+        @os_paths = {}
+      end
       super
     end
     
     def path_for_special_folder(name)
       win32_utils_path = @os_paths[name]
-      return win32_utils_path ? ruby_path(win32_utils_path) : ""
+      return ruby_path(win32_utils_path ? win32_utils_path : path_from_env(name))
+    end
+
+    def path_from_env(name)
+      path_in_env = ENV[name]
+      return path_in_env if(path_in_env)
+      if(name=="MYPICTURES")
+        win7 = "#{@home}\\Pictures"
+        return win7 if(File.exists?(ruby_path(win7)))
+      end
+      return @home
     end
 	
     # Include virtual paths on vindows
     def special_folder_listing
       @special_folder_ids.keys.sort.each do |aFolder|
         puts "#{aFolder}:"
-        puts "\t#{path_for_special_folder aFolder}"
-        puts "\t#{virtual_path_for aFolder}"
+        puts "\tPath: #{path_for_special_folder aFolder}"
+        puts "\tVirtual path: #{virtual_path_for aFolder}"
       end
     end
       
@@ -283,13 +297,14 @@ end
 
 if $0 == __FILE__
   def example
+    puts RUBY_PLATFORM
     shell = WinShell.instance
+    puts shell.class
     h = "Example 1: WinShell.new.specialFolderListing"
     h_line = (1..h.size).collect { |c| '*'}
     puts "#{h_line}\n#{h}\n#{h_line}"
     shell.special_folder_listing
     h = "Example 2. Links on Desktop"
-    h_line = (1..h.size).collect { |c| '*'}
     puts "#{h_line}\n#{h}\n#{h_line}"
     desktop_dir = shell.desktop_directory
     links = Dir[desktop_dir + '/*'].select { |p| shell.link?(File.basename(p)) }
@@ -297,6 +312,11 @@ if $0 == __FILE__
       link_name = File.basename link_path
       puts "#{link_name} => \"#{shell.get_link_target link_name, desktop_dir}\""
     end
+    h = "Example 3. Environment"
+    puts "#{h_line}\n#{h}\n#{h_line}"
+    ENV.each_pair { |key, val|
+      puts("#{key}: #{val}")
+    }
   end
   example
 end

data/lib/piggy-gui/piggy_image_browser.rb

@@ -200,6 +200,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     msg += "Version information:\n"
     msg += "- Plattform #{RUBY_PLATFORM}\n"
     msg += "- Ruby #{RUBY_VERSION} (released #{RUBY_RELEASE_DATE})\n"
+    msg += "- Platform #{RUBY_PLATFORM}\n"
     msg += "- FXRuby #{Fox.fxrubyversion}\n"
     msg += "- FOX Toolkit #{Fox.fxversion}\n"
     msg += "- BarelyFitz Javascript slideshow 1.16\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: Piggy
 version: !ruby/object:Gem::Version 
-  hash: 103
-  prerelease: 
+  hash: 101
+  prerelease: false
   segments: 
   - 0
   - 5
   - 1
-  - 2
-  version: 0.5.1.2
+  - 3
+  version: 0.5.1.3
 platform: ruby
 authors: 
 - Sascha Doerdelmann
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +01:00
+date: 2011-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fxruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: wsdngatrubyforge@hinterkattentuffel.de
 executables: 
@@ -233,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: (P)ick (i)mages and (g)enerate (g)alleries