desktop 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf8e2c8fe943e00600976c2e9ac1f92117ee140
-  data.tar.gz: 1069ee0d452addac29c11031b22f10bcc7662702
+  metadata.gz: 3de2a50f1f1510ad2cb1fd5fe695ba1698221cae
+  data.tar.gz: f4515e4418728f240c2a73c01bc638b03d5fa7f5
 SHA512:
-  metadata.gz: 45a7c8f948a881470f18cd6fb9e1d16a0b0ac1cb1b0916545e74e34732e531f532fb1b75a9d455f532fbe247e98a59baa8066fdb223a58913451b3781853af04
-  data.tar.gz: 3d6725d98c997d0ee5181115c0efce22fce51b1e6f94100aeb6feef4ac6e38f670de2505e8e76ae131f42d11d69a6e085dfe6cb7da5afaa434669128922b36d0
+  metadata.gz: b7cb135b3c2c2769f52a056c9d24863303cf6c8c578c10c9944dfb3ee839c753256b38d3bf137eda9cd404b11f5bfda593df2d89fcf146b004cdba8d020ee9d7
+  data.tar.gz: a3e7f4f5b6cc5375d3b8030b355d64c6c546810b3f0b4acf39a724f453de2922a24c8edd701d3c822c6e2e42719fc805375c8dd6e588acbfb5a375062fd59181

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+##v1.1.1
+*2014-06-06*
+
+- [Don't blow up if OSX is missing data table](https://github.com/chrishunt/desktop/pull/8)
+
 ##v1.1.0
 *2014-06-01*
 

data/README.md

@@ -73,6 +73,19 @@ And use the same CLI interface that you already know:
 Desktop::CLI.start %w[set path/to/image.jpg]
 ```
 
+## Where can I get desktops?
+
+[**Simple Desktops**](http://simpledesktops.com) - A collection of wallpapers
+curated by [Tom Watson](http://tmwtsn.com) designed to make your computer
+beautiful without distraction.
+
+[![](img/simple-desktops.jpg)](http://simpledesktops.com)
+
+[**Vladstudio**](http://www.vladstudio.com/wallpapers) - The project of Russian
+digital artist [Vlad Gerasimov](http://www.vladstudio.com/blog). He creates
+wallpapers for computers and mobile devices.
+
+[![](img/vladstudio.jpg)](http://www.vladstudio.com/wallpapers)
 
 ## Contributing
 Please see the [Contributing

data/lib/desktop.rb

@@ -1,5 +1,6 @@
 require 'desktop/cli'
 require 'desktop/local_image'
-require 'desktop/osx'
 require 'desktop/version'
 require 'desktop/web_image'
+
+require 'desktop/osx/osx'

data/lib/desktop/osx/database.rb

@@ -0,0 +1,42 @@
+require 'sqlite3'
+
+module Desktop
+  class OSX
+    class Database
+      attr_reader :connection
+
+      def initialize(connection = nil)
+        @connection = connection || default_connection
+      end
+
+      def clear_desktop_image
+        clear_data if data?
+      end
+
+      def close
+        connection.close
+      end
+
+      private
+
+      def data?
+        connection.execute(
+          "SELECT name FROM sqlite_master WHERE type='table' AND name='data'"
+        ).any?
+      end
+
+      def clear_data
+        connection.execute 'DELETE FROM data'
+        connection.execute 'VACUUM data'
+      end
+
+      def default_connection
+        SQLite3::Database.new path
+      end
+
+      def path
+        File.expand_path '~/Library/Application Support/Dock/desktoppicture.db'
+      end
+    end
+  end
+end

data/lib/desktop/{osx.rb → osx/osx.rb}

@@ -1,4 +1,4 @@
-require 'sqlite3'
+require 'desktop/osx/database'
 
 module Desktop
   class OSX
@@ -58,9 +58,8 @@ module Desktop
     end
 
     def clear_custom_desktop_image
-      db = SQLite3::Database.new(desktop_image_db_path)
-      db.execute 'DELETE FROM data'
-      db.execute 'VACUUM data'
+      db = Database.new
+      db.clear_desktop_image
       db.close
     end
 
@@ -71,9 +70,5 @@ module Desktop
     def default_desktop_image_path
       '/System/Library/CoreServices/DefaultDesktop.jpg'
     end
-
-    def desktop_image_db_path
-      File.expand_path '~/Library/Application Support/Dock/desktoppicture.db'
-    end
   end
 end

data/lib/desktop/version.rb

@@ -1,3 +1,3 @@
 module Desktop
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/desktop/osx/database_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+require 'desktop/osx/database'
+
+module Desktop
+  describe OSX::Database do
+    def with_connection
+      connection = SQLite3::Database.new ':memory:'
+      yield connection
+    ensure
+      connection.close
+    end
+
+    describe '#clear_desktop_image' do
+      it 'clears contents of data table' do
+        with_connection do |connection|
+          connection.execute("CREATE TABLE data (FileName STRING)")
+          connection.execute("INSERT INTO data VALUES ('mydesktop.png')")
+
+          refute_empty connection.execute("SELECT * FROM data")
+
+          OSX::Database.new(connection).clear_desktop_image
+
+          assert_empty connection.execute("SELECT * FROM data")
+        end
+      end
+
+      it 'does not blow up if data table does not exist' do
+        with_connection do |connection|
+          assert_empty connection.execute(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name='data'"
+          )
+
+          OSX::Database.new(connection).clear_desktop_image
+        end
+      end
+    end
+  end
+end

data/test/desktop/{osx_test.rb → osx/osx_test.rb}

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'desktop/osx'
+require 'desktop/osx/osx'
 require 'desktop/local_image'
 
 module Desktop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desktop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -154,19 +154,23 @@ files:
 - bin/desktop
 - desktop.gemspec
 - img/example.gif
+- img/simple-desktops.jpg
+- img/vladstudio.jpg
 - lib/desktop.rb
 - lib/desktop/cli.rb
 - lib/desktop/http.rb
 - lib/desktop/image.rb
 - lib/desktop/local_image.rb
-- lib/desktop/osx.rb
+- lib/desktop/osx/database.rb
+- lib/desktop/osx/osx.rb
 - lib/desktop/version.rb
 - lib/desktop/web_image.rb
 - test/desktop/cli_test.rb
 - test/desktop/http_test.rb
 - test/desktop/image_test.rb
 - test/desktop/local_image_test.rb
-- test/desktop/osx_test.rb
+- test/desktop/osx/database_test.rb
+- test/desktop/osx/osx_test.rb
 - test/desktop/web_image_test.rb
 - test/fixtures/web_image_data.yml
 - test/test_helper.rb
@@ -199,7 +203,8 @@ test_files:
 - test/desktop/http_test.rb
 - test/desktop/image_test.rb
 - test/desktop/local_image_test.rb
-- test/desktop/osx_test.rb
+- test/desktop/osx/database_test.rb
+- test/desktop/osx/osx_test.rb
 - test/desktop/web_image_test.rb
 - test/fixtures/web_image_data.yml
 - test/test_helper.rb