brandeins 0.1.3 → 0.1.5

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 .bundle
 Gemfile.lock

data/Rakefile

@@ -6,13 +6,13 @@ Rake::TestTask.new do |t|
   t.pattern = 'test/*_test.rb'
 end
 
-task :build do
-  sh 'gem build brandeins.gemspec'
+task :install do
+  sh "gem install ./pkg/brandeins-#{BrandEins::VERSION}.gem"
 end
 
-task :publish do
+task publish: [ :build ] do
   version = BrandEins::VERSION
-  sh "gem push brandeins-#{version}.gem"
+  sh "gem push ./pkg/brandeins-#{BrandEins::VERSION}.gem"
 end
 
 task :default => :test

data/lib/brandeins.rb

@@ -32,7 +32,7 @@ module BrandEins
     method_option :all
     method_option :year, :type => :numeric
     def download
-      path   = options.path || Dir.pwd
+      path   = options.path ? File.expand_path(options.path) : Dir.pwd
       year   = options.year || Time.new.year
       all    = options.all
       volume = options.volume
@@ -40,11 +40,11 @@ module BrandEins
       if volume.nil? && all.nil?
         puts "If you want to download a specific volune use the --volume flag or use --all to download all volumes of a year"
       else
-        b1 = BrandEins::Downloader.new path
+        downloader = BrandEins::Downloader.new path
         if !all.nil?
-          b1.get_magazines_of_year year
+          downloader.get_magazines_of_year year
         else
-          b1.get_magazine year, volume
+          downloader.get_magazine year, volume
         end
       end
     end
@@ -112,7 +112,8 @@ module BrandEins
       pdf_files = pdf_files.reverse.push(pdf_cover).reverse
 
       if !@pdftool.nil?
-        @pdftool.merge_pdf_files(pdf_files, target_pdf)
+        target_pdf_path = "#{@dl_dir}/#{target_pdf}"
+        @pdftool.merge_pdf_files(pdf_files, target_pdf_path)
         cleanup
       else
         if RUBY_PLATFORM.include? 'darwin'

data/lib/brandeins/pdf-tools.rb

@@ -20,11 +20,10 @@ module BrandEins
 
       def merge_pdf_files(pdf_files, target_pdf)
         begin
-          puts "args: #{@args}"
-          arg_files = pdf_files.join " "
-          args = self.args.gsub(/__pdf_files__/, arg_files).gsub(/__target_pdf__/, target_pdf)
+          pdf_files_arg = pdf_files.map {|pdf_file| "'#{pdf_file}'" }.join ' '
+          args = self.args.join(' ').gsub(/__pdf_files__/, pdf_files_arg).gsub(/__target_pdf__/, target_pdf)
           puts "executing: #{@cmd} #{args}"
-          open("|#{@cmd} #{args}").close
+          IO.popen("#{@cmd} #{args}") { |f| puts f.gets }
         rescue Exception => e
           puts "error: #{e.inspect}"
           return false
@@ -49,16 +48,16 @@ module BrandEins
     class PdftkOSX < TemplateOSX
       def initialize
         @cmd  = 'pdftk'
-        @args = '__pdf_files__ output __target_pdf__'
-        @noop = ' --version'
+        @args = ['__pdf_files__', 'output', '__target_pdf__']
+        @noop = ['--version']
       end
     end
 
     class GhostscriptWin < TemplateWin
       def initialize
         @cmd  = 'gswin64c.exe'
-        @args = ' -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=__target_pdf__ __pdf_files__'
-        @noop = ' --version'
+        @args = ['-dNOPAUSE', '-dBATCH', '-sDEVICE=pdfwrite', '-sOutputFile=__target_pdf__', '__pdf_files__']
+        @noop = ['--version']
       end
     end
 

data/lib/brandeins/version.rb

@@ -1,3 +1,3 @@
 module BrandEins
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

data/test/brandeins_test.rb

@@ -13,14 +13,6 @@ class TestBrandEinsDownload < MiniTest::Unit::TestCase
     # testing im allgemeinen: http://holmwood.id.au/~lindsay/2008/04/26/hints-for-testing-your-evolving-ruby-scripts/
   end
 
-  def test_tmp_directories_get_created
-    skip
-    FakeFS do
-      #bdl = BrandEins::Downloader.new @dir
-      #assert File.directory?(File.expand_path("./#{@dir}/tmp"))
-    end
-  end
-
   def test_magazine_url_scraping
     html = <<-EOF
       <div class="jahrgang jahrgang-2012 jahrgang-latest">
@@ -71,15 +63,4 @@ class TestBrandEinsDownload < MiniTest::Unit::TestCase
     assert_equal "Checking requirements for your system\n\nIt seems you have magic running on your system. You are ready to go!\n", out.string
   end
 
-  def test_brandeins_setup_missing_pdf_tool_path
-    pdf_tool = Object.new
-    pdf_tool.define_singleton_method :available? do false end
-    pdf_tool.define_singleton_method :cmd do 'magic' end
-
-    capture_stdout do
-      BrandEins::Setup.new :os => 'x86_64-darwin12.2.0', :pdf_tool => pdf_tool
-    end
-
-    assert_equal "Checking requirements for your system\n\nIt seems you have magic running on your system. You are ready to go!\n", out.string
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brandeins
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -590436749218099656
+      hash: 1431581098543037223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -590436749218099656
+      hash: 1431581098543037223
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24