brandeins 0.2.1 → 0.2.2

data/.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
 *.gem
 .bundle
+.vagrant
 pkg/*
+tags

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brandeins (0.2.1)
+    brandeins (0.2.2)
       nokogiri
       prawn
       rake
@@ -12,7 +12,6 @@ GEM
   specs:
     Ascii85 (1.0.2)
     addressable (2.3.2)
-    afm (0.2.0)
     columnize (0.3.6)
     crack (0.3.2)
     debugger (1.3.1)
@@ -24,15 +23,13 @@ GEM
     debugger-ruby_core_source (1.1.8)
     hashery (2.1.0)
     nokogiri (1.5.6)
-    pdf-reader (1.3.0)
+    pdf-reader (1.2.0)
       Ascii85 (~> 1.0.0)
-      afm (~> 0.2.0)
       hashery (~> 2.0)
       ruby-rc4
-      ttfunk
-    prawn (0.12.0)
+    prawn (1.0.0.rc1)
       pdf-reader (>= 0.9.0)
-      ttfunk (~> 1.0.2)
+      ttfunk (~> 1.0.3)
     rake (10.0.3)
     ruby-rc4 (0.1.5)
     thor (0.17.0)

data/README.md

@@ -1,26 +1,54 @@
-# About BrandEins Downloader
+[![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=master)](http://travis-ci.org/grekko/brandeins) [![Gem Version](https://badge.fury.io/rb/brandeins.png)](http://badge.fury.io/rb/brandeins) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/grekko/brandeins)
+
+BrandEins Downloader
+--------
 
 BrandEins Downloader is a command line tool to download former volumes
-of the german oeconimic magazine "Brand Eins". The articles of former
-are available through there website and BrandEins Downloader takes all
-these fragmented PDFs, downloads and merges them into a single pdf.
+of the german economy magazine [Brand Eins](http://www.brandeins.de/).
+The articles are available on the websites archive and BrandEins Downloader
+helps a little out to download all single fragmented files and merges them
+into a single pdf.
 
 
-## Requirements
+Requirements
+--------
 BrandEins Downloader uses [*pdftk*](http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/) and depends on *ruby*, *rubygems*, and
 several ruby libraries (that you can get through rubygems)
 
 
-## Install
-`gem install brandeins`
+Install
+--------
+
+```bash
+gem install brandeins
+```
+
+
+Usage
+--------
+Download just a certain single magazine
+
+```bash
+brandeins download --path=/Path/where/to/download/the/files --year=2011 --volume=5
+```
+
+Download the whole collection of a year
+
+```bash
+brandeins download --path=/Path/where/to/download/the/files --year=2011 --all
+```
 
 
-## Usage
+Development
+--------
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+- Please create a topic branch for every separate change you make.
+- Update the README.
 
-Download just one magazine
 
-`brandeins download --path=/Path/where/to/download/the/files --year=2011 --volume=5`
+### Author
+[Gregory Igelmund](https://github.com/grekko) [(@grekko)](https://twitter.com/grekko)
 
-Download the whole collecion of a certain year
 
-`brandeins download --path=/Path/where/to/download/the/files --year=2011 --all`
+### Contributors
+[Thorben Schröder](https://github.com/walski)

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require './lib/brandeins/version'
 
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb', 'specs/*_spec.rb']
@@ -8,11 +7,12 @@ Rake::TestTask.new do |t|
 end
 
 task :install do
+  require './lib/brandeins/version'
   sh "gem install ./pkg/brandeins-#{BrandEins::VERSION}.gem"
 end
 
 task publish: [ :build ] do
-  version = BrandEins::VERSION
+  require './lib/brandeins/version'
   sh "gem push ./pkg/brandeins-#{BrandEins::VERSION}.gem"
 end
 

data/Vagrantfile

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "archlinux"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  # config.vm.network :hostonly, "192.168.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file archlinux.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "archlinux.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/brandeins.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-load File.expand_path("../lib/brandeins/version.rb", __FILE__)
+require File.expand_path("../lib/brandeins/version.rb", __FILE__) unless defined? BrandEins::Version
 
 Gem::Specification.new do |s|
   s.name        = "brandeins"

data/lib/brandeins.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'brandeins/version'
+require 'brandeins/errors'
 require 'brandeins/downloader'
 require 'brandeins/setup'
 require 'brandeins/cli'

data/lib/brandeins/downloader.rb

@@ -69,12 +69,11 @@ module BrandEins
       pdf_files = download(pdf_links)
 
       pdf_cover = create_cover_pdf(year, volume)
-      pdf_files = pdf_files.reverse.push(pdf_cover).reverse
+      pdf_files = pdf_files.unshift(pdf_cover)
 
-      if !@pdftool.nil?
+      if @pdftool
         target_pdf_path = "#{@dl_dir}/#{target_pdf}"
-        @pdftool.merge_pdf_files(pdf_files, target_pdf_path)
-        cleanup
+        @pdftool.merge_pdf_files(pdf_files, target_pdf_path) && cleanup
       else
         puts 'brandeins wont merge the single pdf files since it didnt find an appropriate pdf tool' if $BE_VERBOSE
       end

data/lib/brandeins/errors.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module BrandEins
+  class Error < StandardError; end
+end

data/lib/brandeins/merger/{templates → external}/base.rb

@@ -2,7 +2,7 @@
 
 module BrandEins
   module Merger
-    module Templates
+    module External
 
       class Base
 
@@ -29,7 +29,11 @@ module BrandEins
 
         private
         def _exec (cmd)
-          IO.popen(cmd)
+          IO.popen(cmd) do |io|
+            io.each do |line|
+              puts line
+            end
+          end
         end
 
         def _cmd_available? (cmd, args)

data/lib/brandeins/merger/{templates → external}/ghostscript_windows.rb

@@ -2,9 +2,9 @@
 
 module BrandEins
   module Merger
-    module Templates
+    module External
 
-      class GhostscriptWin < BrandEins::Merger::Templates::Windows
+      class GhostscriptWindows < BrandEins::Merger::External::Base
 
         def cmd
           'gswin64c.exe'

data/lib/brandeins/merger/{templates/pdftk_osx.rb → external/pdftk.rb}

@@ -2,9 +2,9 @@
 
 module BrandEins
   module Merger
-    module Templates
+    module External
 
-      class PdftkOSX < BrandEins::Merger::Templates::OSX
+      class Pdftk < BrandEins::Merger::External::Base
 
         def cmd
           'pdftk'

data/lib/brandeins/merger/pdf_tools.rb

@@ -1,45 +1,29 @@
 # encoding: utf-8
-require 'brandeins/merger/extensions'
-require 'brandeins/merger/templates/base'
-require 'brandeins/merger/templates/osx'
-require 'brandeins/merger/templates/pdftk_osx'
-require 'brandeins/merger/templates/windows'
-require 'brandeins/merger/templates/ghostscript_windows'
+require 'brandeins/merger/external/base'
+require 'brandeins/merger/external/pdftk'
+require 'brandeins/merger/external/ghostscript_windows'
 
 module BrandEins
   module Merger
     class PdfTools
 
       class << self
-        def get_pdf_tool(env = nil)
-          @env = env || {}
-          @env[:os] ||= RUBY_PLATFORM
-
-          init_pdf_tools and return_pdf_tool
+        def get_pdf_tool(env = {})
+          env = env || {}
+          env[:os] ||= RUBY_PLATFORM
+          get_klass_for_external(env).new
         end
 
         private
-        def init_pdf_tools
-          template_group = choose_template_group
-          @pdf_tools = get_subclasses template_group
-        end
-
-        def choose_template_group
-          return BrandEins::Merger::Templates::Windows if @env[:os].include? 'w32'
-          return BrandEins::Merger::Templates::OSX     if @env[:os].include? 'darwin'
-        end
 
-        def get_subclasses(klass)
-          classes = []
-          klass.subclasses.each do |sklass|
-            classes << sklass.new
+        def get_klass_for_external(env)
+          if env[:os].include? 'w32'
+            BrandEins::Merger::External::GhostscriptWindows
+          else
+            BrandEins::Merger::External::Pdftk
           end
         end
 
-        def return_pdf_tool
-          @pdf_tools.first.new if @pdf_tools.length > 0
-        end
-
       end
 
     end

data/lib/brandeins/setup.rb

@@ -4,7 +4,7 @@ module BrandEins
   class Setup
 
     def initialize(env = {})
-      @os = env[:os] || RUBY_PLATFORM
+      @os       = env[:os] || RUBY_PLATFORM
       @pdf_tool = env[:pdf_tool] || BrandEins::Merger::PdfTools.get_pdf_tool(env)
     end
 

data/lib/brandeins/version.rb

@@ -1,3 +1,3 @@
 module BrandEins
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brandeins
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,18 +91,17 @@ files:
 - README.md
 - Rakefile
 - TODOS.md
+- Vagrantfile
 - bin/brandeins
 - brandeins.gemspec
 - lib/brandeins.rb
 - lib/brandeins/cli.rb
 - lib/brandeins/downloader.rb
-- lib/brandeins/merger/extensions.rb
+- lib/brandeins/errors.rb
+- lib/brandeins/merger/external/base.rb
+- lib/brandeins/merger/external/ghostscript_windows.rb
+- lib/brandeins/merger/external/pdftk.rb
 - lib/brandeins/merger/pdf_tools.rb
-- lib/brandeins/merger/templates/base.rb
-- lib/brandeins/merger/templates/ghostscript_windows.rb
-- lib/brandeins/merger/templates/osx.rb
-- lib/brandeins/merger/templates/pdftk_osx.rb
-- lib/brandeins/merger/templates/windows.rb
 - lib/brandeins/parser/archive_site.rb
 - lib/brandeins/parser/article_site.rb
 - lib/brandeins/parser/magazine_site.rb
@@ -134,21 +133,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1329463463916465473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1329463463916465473
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: BrandEins gem allows you to download past volumes of the Brand Eins magazine

data/lib/brandeins/merger/extensions.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-class Class
-
-  def subclasses
-    ObjectSpace.each_object(Class).select { |klass| klass < self }
-  end
-
-end

data/lib/brandeins/merger/templates/osx.rb

@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-module BrandEins
-  module Merger
-    module Templates
-
-      class OSX < BrandEins::Merger::Templates::Base; end
-
-    end
-  end
-end

data/lib/brandeins/merger/templates/windows.rb

@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-module BrandEins
-  module Merger
-    module Templates
-
-      class Windows < BrandEins::Merger::Templates::Base; end
-
-    end
-  end
-end