desktop 1.2.0 → 1.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edc8a47310a6a3dc44c4c2387f1e3c6c3451cbe
-  data.tar.gz: 4dda875071a5100581d8625cf586df8f9df1026e
+  metadata.gz: fd0ae66003e3f0c240521ae352379b38c4e164a9
+  data.tar.gz: aa6f4250cc10f900dd0d60f9465f02d064b48a7a
 SHA512:
-  metadata.gz: 64e244b09625712a29d64b17e4d65c0563e316b8639461fe74015eae3d8b16c6a7a7333a848e11773f748ef02db7585c27c324308c9b826e0ee32738b612f621
-  data.tar.gz: 3318654aa90393d1352f82ee296d0dc6d8e96885507433b7685cb64ac1e2aec4f258750de061d6a930943760d61bb73ca185b9b08558c2adab5b1f921f1c748a
+  metadata.gz: 0bdce2e34359a5d97478424b64366723cfdcddc73f2a93c36c8d9131153acde0393a3673f8262c5cff0c25d452740cd6d276055fda556c8ae438eb64a5fd09e1
+  data.tar.gz: d1399592272f691604cdbdc2fafcd0a98821c0bdfe1473be8a2f254a3d4ea0e096724d1ac3508bfea113a7518073215b2ab0c8f492b4bb163e24208c801fd6fb

data/Rakefile

@@ -6,4 +6,9 @@ task :test do
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end
 
+desc 'Open an irb session preloaded with this library'
+task :console do
+  sh 'irb -rubygems -I lib -r desktop.rb'
+end
+
 task default: :test

data/desktop.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday",  "~> 0.9"
-  spec.add_dependency "sqlite3",  "~> 1.3"
-  spec.add_dependency "thor",     "~> 0.19"
+  spec.add_dependency "faraday",  "~> 0.9.1"
+  spec.add_dependency "sqlite3",  "~> 1.3.10"
+  spec.add_dependency "thor",     "~> 0.19.1"
 
-  spec.add_development_dependency "bundler",  "~> 1.7.1"
-  spec.add_development_dependency "minitest", "~> 5.4"
-  spec.add_development_dependency "pry",      "~> 0.10.1"
-  spec.add_development_dependency "rake",     "~> 10.3"
-  spec.add_development_dependency "vcr",      "~> 2.9"
-  spec.add_development_dependency "webmock",  "~> 1.18"
+  spec.add_development_dependency "bundler",  "~> 1.10.6"
+  spec.add_development_dependency "minitest", "~> 5.8.1"
+  spec.add_development_dependency "pry",      "~> 0.10.2"
+  spec.add_development_dependency "rake",     "~> 10.4.2"
+  spec.add_development_dependency "vcr",      "~> 2.9.3"
+  spec.add_development_dependency "webmock",  "~> 1.21.0"
 end

data/lib/desktop/cli.rb

@@ -15,22 +15,14 @@ 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)
+    def set(path)
       osx = OSX.new(options)
       image = HTTP.uri?(path) ? WebImage.new(path) : LocalImage.new(path)
 
       begin
         osx.desktop_image = image
-      rescue OSX::DesktopImagePermissionsError => e
-        fail_with_permissions_error if already_failed
-
-        print_permissions_message
-        osx.update_desktop_image_permissions
-        puts
-        set path, true
       rescue OSX::DesktopImageMissingError
         fail_with_missing_image_error image
       end
@@ -43,41 +35,15 @@ module Desktop
 
     private
 
-    def fail_with_permissions_error
-      print "Sorry, but I was unable to change your desktop image. "
-      puts  "The permissions are still incorrect."
-      puts
-      puts  "Did you type your password incorrectly?"
-      puts
-      print_issues_message
-      abort
-    end
-
     def fail_with_missing_image_error(image)
       puts "Sorry, but it looks like the image you provided does not exist:"
       puts
       puts image.path
       puts
-      print_issues_message
-      abort
-    end
-
-    def print_permissions_message
-      print "It looks like this is the first time you've tried to change "
-      puts  "your desktop."
-      puts
-      print "We need to make your desktop image writable before we can "
-      puts  "change it. This only needs to be done once."
-      puts
-      puts  "$ #{OSX.chown_command}"
-      puts  "$ #{OSX.chmod_command}"
-      puts
-    end
-
-    def print_issues_message
       puts "Please create an issue if you think this is my fault:"
       puts
       puts "https://github.com/chrishunt/desktop/issues/new"
+      abort
     end
   end
 end

data/lib/desktop/osx/database.rb

@@ -10,7 +10,13 @@ module Desktop
       end
 
       def clear_desktop_image
-        clear_data if data?
+        clear if data?
+      end
+
+      def set_desktop_image(desktop_image_path)
+        create unless data?
+
+        ([desktop_image_path] * 100).each { |path| insert(path) }
       end
 
       def close
@@ -25,11 +31,20 @@ module Desktop
         ).any?
       end
 
-      def clear_data
+      def insert(data)
+        connection.execute 'INSERT INTO data (value) VALUES (?)', data
+      end
+
+      def clear
         connection.execute 'DELETE FROM data'
         connection.execute 'VACUUM data'
       end
 
+      def create
+        connection.execute 'CREATE TABLE data (value)'
+        connection.execute 'CREATE INDEX data_index ON data (value)'
+      end
+
       def default_connection
         SQLite3::Database.new path
       end

data/lib/desktop/osx/osx.rb

@@ -2,102 +2,53 @@ require 'desktop/osx/database'
 
 module Desktop
   class OSX
-    class DesktopImagePermissionsError < StandardError; end
     class DesktopImageMissingError < StandardError; end
 
     def self.desktop_image=(image)
       self.new.desktop_image = image
     end
 
-    def self.update_desktop_image_permissions
-      self.new.update_desktop_image_permissions
-    end
-
-    def self.chown_command
-      self.new.chown_command
-    end
-
-    def self.chmod_command
-      self.new.chmod_command
-    end
-
     def initialize(options = nil)
       options ||= {}
       @skip_reload = options[:skip_reload]
       @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
+      write_desktop image
+      save_image_path_in_database unless skip_database
       reload_desktop unless skip_reload
-    rescue Errno::EACCES => e
-      raise DesktopImagePermissionsError.new(e)
     rescue Errno::ENOENT => e
       raise DesktopImageMissingError.new(e)
     end
 
-    def update_desktop_image_permissions
-      system(chown_command) && system(chmod_command)
-    end
-
-    def chown_command
-      [' -h ', ' '].map do |option|
-        "sudo chown#{option}$('whoami'):staff #{desktop_image_path}"
-      end.join(" && ")
-    end
-
-    def chmod_command
-      [' -h ', ' '].map do |option|
-        "sudo chmod#{option}664 #{desktop_image_path}"
-      end.join(" && ")
-    end
-
     private
 
     attr_reader :desktop_image_path,
-                :cached_image_path,
                 :skip_reload,
                 :skip_database
 
-    def write_default_desktop(image)
+    def write_desktop(image)
       File.open(desktop_image_path, 'w') do |desktop|
         desktop.write image.data
       end
     end
 
-    def clear_custom_desktop_image
+    def save_image_path_in_database
       db = Database.new
       db.clear_desktop_image
+      db.set_desktop_image desktop_image_path
       db.close
     end
 
-    def touch_desktop_image
-      unless system("touch -h #{desktop_image_path} 2>/dev/null")
-        raise Errno::EACCES
-      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'
+      File.expand_path "~/Library/Application Support/desktop-gem-wallpaper.jpg"
     end
   end
 end

data/lib/desktop/version.rb

@@ -1,3 +1,3 @@
 module Desktop
-  VERSION = '1.2.0'
+  VERSION = '1.3.0.pre'
 end

data/test/desktop/cli_test.rb

@@ -8,37 +8,31 @@ 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, cached, image, defaults
+      yield desktop, 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/database_test.rb

@@ -5,14 +5,16 @@ module Desktop
   describe OSX::Database do
     def with_connection
       connection = SQLite3::Database.new ':memory:'
-      yield connection
+      desktop_image = Tempfile.new(%w[desktop .jpg])
+      yield connection, desktop_image.path
     ensure
+      desktop_image.unlink
       connection.close
     end
 
     describe '#clear_desktop_image' do
       it 'clears contents of data table' do
-        with_connection do |connection|
+        with_connection do |connection, _|
           connection.execute("CREATE TABLE data (FileName STRING)")
           connection.execute("INSERT INTO data VALUES ('mydesktop.png')")
 
@@ -25,7 +27,7 @@ module Desktop
       end
 
       it 'does not blow up if data table does not exist' do
-        with_connection do |connection|
+        with_connection do |connection, _|
           assert_empty connection.execute(
             "SELECT name FROM sqlite_master WHERE type='table' AND name='data'"
           )
@@ -34,5 +36,30 @@ module Desktop
         end
       end
     end
+
+    describe '#set_desktop_image' do
+      it 'fills the data table with entries for the new desktop image' do
+        with_connection do |connection, desktop_image_path|
+          connection.execute("CREATE TABLE data (value)")
+
+          assert_empty connection.execute("SELECT * FROM data")
+
+          OSX::Database.new(connection).set_desktop_image(desktop_image_path)
+
+          assert_equal [[desktop_image_path]] * 100,
+            connection.execute("SELECT * FROM data")
+        end
+      end
+
+      it 'does not blow up if data table does not exist' do
+        with_connection do |connection, desktop_image_path|
+          assert_empty connection.execute(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name='data'"
+          )
+
+          OSX::Database.new(connection).set_desktop_image(desktop_image_path)
+        end
+      end
+    end
   end
 end

data/test/desktop/osx/osx_test.rb

@@ -6,43 +6,23 @@ 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, cached, image
+      yield osx, desktop, 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|
-          FileUtils.chmod 'a-w', desktop
-
-          assert_raises OSX::DesktopImagePermissionsError do
-            osx.desktop_image = LocalImage.new(image)
-          end
-        end
-      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.2.0
+  version: 1.3.0.pre
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,126 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.8.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: 1.21.0
 description: A decent way to change your desktop image
 email:
 - c@chrishunt.co
@@ -190,12 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A decent way to change your desktop image