wgif 0.0.1.pre → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29562cbe754b572ffd1fc5e20a397b96405a703b
-  data.tar.gz: 3c7307a0a239c7867d2d6a205c14153e8b7c44f3
+  metadata.gz: d808e6c96d0dfe1070dbcdc750412e5b4f84c862
+  data.tar.gz: 242b7baf97aa7968e7e082af1de2ea6c933a24d7
 SHA512:
-  metadata.gz: 5953cef31a710c37e9d99e229673005c4737f20952150b398a678088b45ee67b61835d5311a1271a0aaae454b9299de2e3c1253efd135bdcc3b9ed65c22024b1
-  data.tar.gz: bfb4c0a042e3baefaca3f35621787041e0870f4c98a2cfba4cac5cb4e4cb0ec939a6b8ee941d1752588268cc3b748a8ac8fb38ea4b9c110363179e72e50f2ee5
+  metadata.gz: b0e44313b6eb58f5c8adae849d3466eed79131707d9a107494e6ec3cf425bc9cd774ea5fdd7f34c5c2101d836e537cc8bcafe85349afef2b12f0bff5788c0455
+  data.tar.gz: 8241d6bb255012480ffb84b79f6bea5adf6b4182eb8d0d680f7c971859bd5fd03a4b28500c9ec51fe310240c5c73d10a8a17c013bc01a6761aa02346db968505

data/lib/wgif/cli.rb

@@ -1,7 +1,5 @@
 require 'optparse'
 require 'wgif/exceptions'
-require 'wgif/downloader'
-require 'wgif/gif_maker'
 require 'wgif/installer'
 
 module WGif
@@ -65,6 +63,8 @@ module WGif
 
     def make_gif(cli_args)
       WGif::Installer.new.run if cli_args[0] == 'install'
+      require 'wgif/downloader'
+      require 'wgif/gif_maker'
       rescue_errors do
         args = parse_args cli_args
         validate_args(args)

data/lib/wgif/installer.rb

@@ -1,17 +1,27 @@
 module WGif
   class Installer
 
-    DEPENDENCIES = [['ffmpeg', 'ffmpeg'], ['imagemagick', 'convert']]
+    DEPENDENCIES = [['ffmpeg', 'ffmpeg'],
+                    ['imagemagick', 'convert']]
 
     def run
+      if dependencies_installed?
+        puts "All dependencies are installed. Go make a GIF."
+        Kernel.exit 0
+      end
       if homebrew_installed?
         DEPENDENCIES.each do |dependency, binary|
           install(dependency, binary)
         end
       else
         puts "WGif can't find Homebrew. Visit http://brew.sh/ to get it."
-        Kernel.exit 0
+        Kernel.exit 1
       end
+      Kernel.exit 0
+    end
+
+    def dependencies_installed?
+      DEPENDENCIES.map {|_, binary| installed?(binary)}.inject(:&)
     end
 
     def homebrew_installed?
@@ -21,7 +31,7 @@ module WGif
     def install(dependency, binary)
       unless installed?(binary)
         puts "Installing #{dependency}..."
-        Kernel.system "brew install #{dependency} > /dev/null"
+        Kernel.system "brew install #{dependency}"
         puts "Successfully installed #{dependency}."
       end
     end

data/lib/wgif/version.rb

@@ -1,3 +1,3 @@
 module WGif
-  VERSION = "0.0.1.pre"
+  VERSION = "0.0.1"
 end

data/spec/wgif/installer_spec.rb

@@ -29,19 +29,39 @@ describe WGif::Installer do
 
   end
 
+  context 'checking for dependencies' do
+
+    it 'returns true if dependencies are installed' do
+      expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
+        and_return(true)
+      expect(Kernel).to receive(:system).with('which convert > /dev/null').
+        and_return(true)
+      expect(installer.dependencies_installed?).to eq(true)
+    end
+
+    it 'returns false if dependencies are not installed' do
+      expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
+        and_return(true)
+      expect(Kernel).to receive(:system).with('which convert > /dev/null').
+        and_return(false)
+      expect(installer.dependencies_installed?).to eq(false)
+    end
+
+  end
+
   context 'installing dependencies' do
 
     it 'does not install dependencies if they are found' do
       expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
         and_return(true)
-      expect(Kernel).not_to receive(:system).with('brew install ffmpeg > /dev/null')
+      expect(Kernel).not_to receive(:system).with('brew install ffmpeg')
       installer.install('ffmpeg', 'ffmpeg')
     end
 
     it 'installs dependencies' do
       expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
         and_return(false)
-      expect(Kernel).to receive(:system).with('brew install ffmpeg > /dev/null')
+      expect(Kernel).to receive(:system).with('brew install ffmpeg')
       installer.install('ffmpeg', 'ffmpeg')
     end
 
@@ -63,15 +83,19 @@ describe WGif::Installer do
     it 'installs all dependencies' do
       expect(Kernel).to receive(:system).with('brew info > /dev/null').
         and_return(true)
-      expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
+      expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').twice.
         and_return(true)
-      expect(Kernel).to receive(:system).with('which convert > /dev/null').
+      expect(Kernel).to receive(:system).with('which convert > /dev/null').twice.
         and_return(false)
-      expect(Kernel).to receive(:system).with('brew install imagemagick > /dev/null')
-      installer.run
+      expect(Kernel).to receive(:system).with('brew install imagemagick')
+      expect{ installer.run }.to raise_error(SystemExit)
     end
 
     it 'prints a helpful error if homebrew is not found' do
+      expect(Kernel).to receive(:system).with('which ffmpeg > /dev/null').
+        and_return(true)
+      expect(Kernel).to receive(:system).with('which convert > /dev/null').
+        and_return(false)
       expect(Kernel).to receive(:system).with('brew info > /dev/null').
         and_return(false)
       expect{ installer.run }.to raise_error(SystemExit)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wgif
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1
 platform: ruby
 authors:
 - Connor Mendenhall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -201,9 +201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3