groove-dl 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e17d5b6175966c9fec3dce394ce8f9141972c7a
-  data.tar.gz: 932683ebd3c840eb78d383f420f388300ed77008
+  metadata.gz: cf2c65506f5ca02c45012c1800aba067cab99c0d
+  data.tar.gz: 1235dd8d45c8820147742e2121655f674f76ce3b
 SHA512:
-  metadata.gz: 378b74a24deda1ef38d7993ed23d719a0f95d858df48a9d20693bcdca01e6656b3ca35819140d39d84c33bfa68e57448baadf1a8a574fa4cdbfd413f6b95da60
-  data.tar.gz: 679684a9d0f94125a7c32c3e0c45ce298f188988fc5f782f0c3f6488a3ccde9050bbee6a62dec3264076be6aae5e282db98d574079a9e29e1aa5d7281efdab33
+  metadata.gz: b65c4781a2b339e5753d15bb8f066188c3b944d824173532d4337852602c36d6487c08109652ff24737755ab6fbed0114a72f94ec29811f2f7d043bde58a3a2b
+  data.tar.gz: ea2ee4a79b2ae9d04443f4ae7b90b135dcf19ff72facbe8f958049029a519b42151db56961998be9d5daf3d03182c25bba7eafacd894111ba8a85ffa80629bae

data/MANIFEST

@@ -7,7 +7,6 @@ MANIFEST
 README.md
 Rakefile
 bin/groove-dl
-bin/groove-dl-cli
 glade/groove-dl.glade
 groove-dl.gemspec
 lib/groove-dl.rb

data/README.md

@@ -37,7 +37,7 @@ Run `groove-dl` and a gtk app will be displayed, you can:
 In CLI mode:
 
 ```bash
-$ groove-dl-cli --help
+$ groove-dl --help
 Usage: groove-dl [COMMAND] [OPTIONS]
 
 Options:
@@ -57,7 +57,7 @@ See `<command> --help` for more information on a specific command.
 
 Search for song:
 ```bash
-$ groove-dl-cli search --help
+$ groove-dl search --help
 Usage: groove-dl search [OPTIONS]
 
 Options:

data/bin/groove-dl

@@ -3,13 +3,24 @@
 
 require File.expand_path('../../lib/groove-dl', __FILE__)
 
-require 'gtk3'
-require 'shellwords'
-require 'groove-dl/app'
-require 'groove-dl/widgets/events'
-require 'groove-dl/widgets/search'
-require 'groove-dl/widgets/download'
-
-Gtk.init
-GrooveDl::App.new('glade/groove-dl.glade')
-Gtk.main
+require 'ruby-progressbar'
+require 'slop'
+require 'terminal-table'
+
+require 'groove-dl/cli'
+require 'groove-dl/cli/search'
+require 'groove-dl/displayer'
+
+options = GrooveDl::CLI.options
+if options.parse.empty?
+  require 'gtk3'
+  require 'shellwords'
+  require 'groove-dl/app'
+  require 'groove-dl/widgets/events'
+  require 'groove-dl/widgets/search'
+  require 'groove-dl/widgets/download'
+
+  Gtk.init
+  GrooveDl::App.new('glade/groove-dl.glade')
+  Gtk.main
+end

data/groove-dl.gemspec

@@ -11,19 +11,19 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/PierreRambaud/groove-dl'
   s.description = 'Grooveshark downloader allow you to search, choose ' \
                   'playlists and songs and download them.'
-  s.executables = ['groove-dl', 'groove-dl-cli']
+  s.executables = ['groove-dl']
 
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'slop', '~>3.6'
-  s.add_dependency 'grooveshark', '~>0.2.12'
-  s.add_dependency 'ruby-progressbar', '~>1.7.0'
-  s.add_dependency 'terminal-table', '~>1.4.5'
+  s.add_dependency 'grooveshark', '~> 0.2', '>= 0.2.12'
+  s.add_dependency 'ruby-progressbar', '~> 1.7', '>= 1.7.0'
+  s.add_dependency 'terminal-table', '~> 1.4', '>= 1.4.5'
   s.add_dependency 'gtk3', '~>2.2'
 
-  s.add_development_dependency 'fakefs', '~>0.6.0'
+  s.add_development_dependency 'fakefs', '~> 0.6', '>= 0.6.0'
   s.add_development_dependency 'rake', '~>10.0'
   s.add_development_dependency 'rack-test', '~>0.6'
   s.add_development_dependency 'rspec', '~>3.0'

data/lib/groove-dl/cli.rb

@@ -40,7 +40,12 @@ module GrooveDl
 
           client = Grooveshark::Client.new
           d = Downloader.new(client, opts)
-          d.playlist(opts[:p]) if opts[:p]
+          if opts[:p]
+            GrooveDl.configuration.logger
+              .info("Download files into #{d.output_directory}")
+            d.playlist(opts[:p])
+          end
+
           d.song(opts[:s]) if opts[:s]
         end
       end

data/lib/groove-dl/downloader.rb

@@ -3,10 +3,8 @@ module GrooveDl
   # Downloader Class
   class Downloader
     attr_accessor :type
-    attr_writer :client
-    attr_writer :download_queue
-    attr_writer :download_count
-    attr_writer :download_skip
+    attr_writer :client, :download_queue, :download_count, :download_skip
+    attr_reader :output_directory, :queue, :count, :skip
 
     ##
     # Initialize download
@@ -83,7 +81,11 @@ module GrooveDl
     def download_queue
       return false if @queue.empty?
       @queue.each do |song|
-        download(song, build_path(@output_directory, song))
+        begin
+          download(song, build_path(@output_directory, song))
+        rescue StandardError => e
+          GrooveDl.configuration.logger.error(e.message)
+        end
       end
 
       { skipped: @skip, downloaded: @count }
@@ -124,6 +126,10 @@ module GrooveDl
         pbar = ProgressBar.create(title: destination.split('/').last,
                                   format: '%a |%b>>%i| %p%% %t',
                                   total: response['content-length'].to_i)
+
+        dirname = File.dirname(destination)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+
         File.open(destination, 'w') do |f|
           response.read_body do |chunk|
             f.write(chunk)

data/lib/groove-dl/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # GrooveDl version
 module GrooveDl
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/groove-dl/widgets/download.rb

@@ -7,6 +7,8 @@ module GrooveDl
       attr_accessor :search_list, :songs, :downloader
       attr_accessor :failed, :success, :queue
 
+      attr_reader :queue_store, :failed_store, :success_store
+
       RIGHT_CLICK = 3
 
       SUCCESS_COLUMN_PATH,
@@ -69,6 +71,7 @@ module GrooveDl
         search_list_store.each do |_model, _path, iter|
           next unless iter[column_checkbox]
           selected[iter[column_id]] = @search_list.data[iter[column_id]]
+          iter[column_checkbox] = false
         end
 
         @queue_store = @app.get_object('download_queue_list_store')

data/spec/groove-dl/cli_spec.rb

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 require 'groove-dl/cli'
+require 'groove-dl/configuration'
 require 'slop'
+require 'logger'
 
 # Groove Dl tests
 module GrooveDl
@@ -32,9 +34,11 @@ module GrooveDl
       end
 
       it 'should download playlist' do
+        allow_any_instance_of(Logger).to receive(:info)
         allow(Grooveshark::Client).to receive(:new).and_return(true)
         downloader = double
         allow(downloader).to receive(:playlist).with(1).and_return(true)
+        allow(downloader).to receive(:output_directory).and_return('/tmp')
         allow(Downloader).to receive(:new).and_return(downloader)
         expect(CLI.options.parse %w( -p 1)).to eq(['-p', '1'])
       end

data/spec/groove-dl/downloader_spec.rb

@@ -27,6 +27,14 @@ module GrooveDl
       expect(@downloader.download_queue).to be_falsy
     end
 
+    it 'should log error when download failed' do
+      @downloader.queue << 'something'
+      allow_any_instance_of(Logger).to receive(:error)
+        .with("undefined method `artist' for \"something\":String")
+      expect(@downloader.download_queue)
+        .to eq(skipped: 0, downloaded: 0)
+    end
+
     it 'should download playlist' do
       allow(@client).to receive(:request)
         .and_return('songs' => [{ 'song_id' =>  1,

metadata

@@ -1,167 +1,191 @@
 --- !ruby/object:Gem::Specification
 name: groove-dl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: grooveshark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.12
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
 description: Grooveshark downloader allow you to search, choose playlists and songs
@@ -169,20 +193,18 @@ description: Grooveshark downloader allow you to search, choose playlists and so
 email: pierre.rambaud86@gmail.com
 executables:
 - groove-dl
-- groove-dl-cli
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - MANIFEST
 - README.md
 - Rakefile
 - bin/groove-dl
-- bin/groove-dl-cli
 - glade/groove-dl.glade
 - groove-dl.gemspec
 - lib/groove-dl.rb
@@ -214,17 +236,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Grooveshark songs downloader.

data/bin/groove-dl-cli

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-
-require File.expand_path('../../lib/groove-dl', __FILE__)
-
-require 'ruby-progressbar'
-require 'slop'
-require 'terminal-table'
-
-require 'groove-dl/cli'
-require 'groove-dl/cli/search'
-require 'groove-dl/displayer'
-
-options = GrooveDl::CLI.options
-puts options if options.parse.empty?