desktop 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f400e39b6089ea0778e12d40d0812da8d63878
-  data.tar.gz: 09bee821d3197e6859a31ffb44927de974175485
+  metadata.gz: 0edc8a47310a6a3dc44c4c2387f1e3c6c3451cbe
+  data.tar.gz: 4dda875071a5100581d8625cf586df8f9df1026e
 SHA512:
-  metadata.gz: 1a4ce36b5eaa21c360eec8744b37b91b07d22de9e95068a001be9c84035a9825916f35138ebea9d73e373bb535f0fdc5493c2286d1f2cde33bd390e091688b69
-  data.tar.gz: f0c0816b2497eaccca98f6506772d8efea7fd22b71ecc03241c99d0c6e1a1a74c5eaaa273410806789b00e1b6f8bbda52b2455ed30813a85a352036f652f2c5a
+  metadata.gz: 64e244b09625712a29d64b17e4d65c0563e316b8639461fe74015eae3d8b16c6a7a7333a848e11773f748ef02db7585c27c324308c9b826e0ee32738b612f621
+  data.tar.gz: 3318654aa90393d1352f82ee296d0dc6d8e96885507433b7685cb64ac1e2aec4f258750de061d6a930943760d61bb73ca185b9b08558c2adab5b1f921f1c748a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+##v1.2.0
+*2014-11-22*
+
+- [Remove cached desktop image](https://github.com/chrishunt/desktop/pull/20)
+
 ##v1.1.2
 *2014-10-17*
 

data/lib/desktop/cli.rb

@@ -15,6 +15,7 @@ module Desktop
       > $ desktop set http://url.to/image.jpg
     LONGDESC
     option :desktop_image_path, :hide => true
+    option :cached_image_path, :hide => true
     option :skip_reload, :type => :boolean, :hide => true
     option :skip_database, :type => :boolean, :hide => true
     def set(path, already_failed = false)

data/lib/desktop/osx/osx.rb

@@ -2,7 +2,6 @@ require 'desktop/osx/database'
 
 module Desktop
   class OSX
-    attr_reader :desktop_image_path, :skip_reload, :skip_database
     class DesktopImagePermissionsError < StandardError; end
     class DesktopImageMissingError < StandardError; end
 
@@ -28,12 +27,15 @@ module Desktop
       @skip_database = options[:skip_database]
       @desktop_image_path = \
         options[:desktop_image_path] || default_desktop_image_path
+      @cached_image_path = \
+        options[:cached_image_path] || default_cached_image_path
     end
 
     def desktop_image=(image)
       write_default_desktop image
       clear_custom_desktop_image unless skip_database
       touch_desktop_image
+      remove_cached_image
       reload_desktop unless skip_reload
     rescue Errno::EACCES => e
       raise DesktopImagePermissionsError.new(e)
@@ -59,6 +61,11 @@ module Desktop
 
     private
 
+    attr_reader :desktop_image_path,
+                :cached_image_path,
+                :skip_reload,
+                :skip_database
+
     def write_default_desktop(image)
       File.open(desktop_image_path, 'w') do |desktop|
         desktop.write image.data
@@ -77,10 +84,18 @@ module Desktop
       end
     end
 
+    def remove_cached_image
+      system "rm #{cached_image_path} 2>/dev/null"
+    end
+
     def reload_desktop
       system 'killall Dock'
     end
 
+    def default_cached_image_path
+      '/Library/Caches/com.apple.desktop.admin.png'
+    end
+
     def default_desktop_image_path
       '/System/Library/CoreServices/DefaultDesktop.jpg'
     end

data/lib/desktop/version.rb

@@ -1,3 +1,3 @@
 module Desktop
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/test/desktop/cli_test.rb

@@ -8,31 +8,37 @@ module Desktop
       desktop.write 'Default content'
       desktop.rewind
 
+      cached = Tempfile.new(%w[cached .jpg])
+      cached.write 'Cached content'
+      cached.rewind
+
       image = Tempfile.new(%w[image .jpg])
       image.write 'New content'
       image.rewind
 
       defaults = [
         "--desktop-image-path=#{desktop.path}",
+        "--cached-image-path=#{cached.path}",
         "--skip-reload",
         "--skip-database"
       ]
 
-      yield desktop, image, defaults
+      yield desktop, cached, image, defaults
     ensure
       desktop.unlink
+      cached.unlink
       image.unlink
     end
 
     it 'sets the desktop when a local image path is provided' do
-      with_defaults do |desktop, image, defaults|
+      with_defaults do |desktop, _, image, defaults|
         CLI.start ['set', image.path] + defaults
         assert_equal File.read(desktop), File.read(image)
       end
     end
 
     it 'sets the desktop when a web url is provided' do
-      with_defaults do |desktop, _, defaults|
+      with_defaults do |desktop, _, _, defaults|
         VCR.use_cassette('web_image_data') do
           CLI.start ['set', 'http://f.cl.ly/image.jpg'] + defaults
           refute_equal 'Default content', File.read(desktop)

data/test/desktop/osx/osx_test.rb

@@ -6,23 +6,33 @@ module Desktop
   describe OSX do
     def osx
       desktop = Tempfile.new(%w[desktop .jpg])
+      cached  = Tempfile.new(%w[cached .jpg])
       image   = Tempfile.new(%w[image .jpg])
 
       osx = OSX.new(
         :desktop_image_path => desktop.path,
+        :cached_image_path  => cached.path,
         :skip_reload        => true,
         :skip_database      => true
       )
 
-      yield osx, desktop, image
+      yield osx, desktop, cached, image
     ensure
       desktop.unlink
+      cached.unlink
       image.unlink
     end
 
     describe '#desktop_image=' do
+      it 'removes the cached desktop image' do
+        osx do |osx, _, cached, image|
+          osx.desktop_image = LocalImage.new(image)
+          refute File.exists?(cached.path)
+        end
+      end
+
       it 'raises DesktopImagePermissionsError when desktop is readonly' do
-        osx do |osx, desktop, image|
+        osx do |osx, desktop, _, image|
           FileUtils.chmod 'a-w', desktop
 
           assert_raises OSX::DesktopImagePermissionsError do
@@ -32,7 +42,7 @@ module Desktop
       end
 
       it 'raises DesktopImageMissingError when new image is missing' do
-        osx do |osx, _, _|
+        osx do |osx, _, _, _|
           assert_raises OSX::DesktopImageMissingError do
             osx.desktop_image = LocalImage.new('/invalid/image/path.jpg')
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desktop
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday