wwdcdownloader 20.14.1 → 20.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4954023386da2a0d4076fe38a3ffbdcadf72c01
-  data.tar.gz: 6c76eb1955017d4ed8ba9df6438e8804dbd5a030
+  metadata.gz: 0fe0443938f3d059a6f274bf211800297bcf90c1
+  data.tar.gz: e7b3467543be7066b09be3d4e6644b1a66ee7210
 SHA512:
-  metadata.gz: b4f19a3ac402cddb8d93342540d71b06a2f6ca41ab41228d29fe61a4ca6fad060716b2dd5f0da4399bcb9d6801649a2ee544eec1d6388d828b4b6caddedacd71
-  data.tar.gz: 6ea9fdf08da738b46637dc30eebd693b3d3c3865a4c191bd21878ddb45facb4f2fe77597bd78628c39393a23847703fe698934c7cf7a2249e4842c4e225a3113
+  metadata.gz: fbd64abd2413b12da383cb42b60e24cf510697c94208a7b83dd5471f562fce94b45d6e278489f0a43ea040e71132ad7306d27bfc9bb9328c11b288d2b9de00c1
+  data.tar.gz: f8861a8f33c8cff7f76e53624fd360f7164b97e66c62d77174b22340e855d23d32d85db82d8611ab833d1c418ad46de260eac5089c8c28db0c82fcc9d9be75ca

data/Gemfile

@@ -3,14 +3,11 @@ source "https://rubygems.org"
 # If you make any changes in this file, please run `bundle install`.
 # If new versions of your installed gems are available, run `bundle update`
 
-gem "mechanize", "~> 2.7.1"
 gem "json", "~> 1.8.0"
-gem "highline", "~> 1.6.19"
-gem "nokogiri", "~> 1.5.0"
 
 group :development do
   #gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.3.0"
+  gem "bundler", "~> 1.9.0"
   gem "jeweler", "~> 1.8.0"
   #gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,13 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     builder (3.2.2)
-    domain_name (0.5.18)
-      unf (>= 0.0.5, < 1.0.0)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    git (1.2.6)
+    git (1.2.9.1)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
@@ -15,10 +13,8 @@ GEM
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    hashie (3.0.0)
-    highline (1.6.21)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+    hashie (3.4.2)
+    highline (1.7.2)
     jeweler (1.8.8)
       builder
       bundler (~> 1.0)
@@ -28,47 +24,27 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mechanize (2.7.3)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (~> 2.0)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (2.3)
-    multi_json (1.10.1)
+    json (1.8.3)
+    jwt (1.5.0)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9.4)
     nokogiri (1.5.10)
-    ntlm-http (0.1.1)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
+    rack (1.6.1)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.6)
-    webrobots (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3.0)
-  highline (~> 1.6.19)
+  bundler (~> 1.9.0)
   jeweler (~> 1.8.0)
   json (~> 1.8.0)
-  mechanize (~> 2.7.1)
-  nokogiri (~> 1.5.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Johannes Fahrenkrug
+Copyright (c) 2015 Johannes Fahrenkrug
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Readme.md

@@ -1,22 +1,22 @@
-# WWDC 2014 Sample Code Downloader
+# WWDC 2015 Sample Code Downloader
 
 ![First World WWDC Sample Code Problem](http://cdn.memegenerator.net/instances/400x/21928207.jpg)
 
 ## Sad days are over
 
-This script will download all the session material for you if you are a WWDC 2014 attendee OR NOT! This year you only need to have an Apple Developer account, that's it!
+This script will download all the session material for you if you are a WWDC 2015 attendee OR NOT!
 You can now simply install WWDC-Downloader as a ruby gem like this:
 
-    gem install wwdcdownloader --no-rdoc --no-ri
+    gem install wwdcdownloader
 
 or
 
-    sudo gem install wwdcdownloader --no-rdoc --no-ri
+    sudo gem install wwdcdownloader
 
 Run the script like this: 
 
-    wwdcdownloader <your Apple ID> [<target-dir>]
+    wwdcdownloader [<target-dir>]
 
-The script will create a directory called "wwdc2014-assets" (or `target-dir` if given) in the directory you run the script from.
+The script will create a directory called "wwdc2015-assets" (or `target-dir` if given) in the directory you run the script from.
 
 That's it. Enjoy and see you next year.

data/VERSION

@@ -1 +1 @@
-20.14.1
+20.15.0

data/lib/wwdcdownloader.rb

@@ -1,18 +1,16 @@
 # Have fun. Use at your own risk.
-# Copyright (c) 2014 Johannes Fahrenkrug
+# Copyright (c) 2015 Johannes Fahrenkrug
 
 require 'rubygems'
 require 'fileutils'
 require 'net/http'
 
 begin
-  require 'mechanize'
   require 'json'
-  require 'highline/import'
 rescue LoadError => e
   puts
-  puts "You need to have the mechanize, json and highline gems installed."
-  puts "Install them by running"
+  puts "You need to have the json gem installed."
+  puts "Install it by running"
   puts
   puts "  bundle install"
   puts
@@ -26,23 +24,20 @@ end
 class WWDCDownloader
   #BASE_URI = 'https://developer.apple.com/wwdc-services/cy4p09ns/a4363cb15472b00287b/sessions.json'
 
-  WWDC_LIBRARIES = [{:base => 'https://developer.apple.com/library/prerelease/ios', :lib => '/navigation/library.json'}, 
+  WWDC_LIBRARIES = [{:base => 'https://developer.apple.com/library/prerelease/ios', :lib => '/navigation/library.json'},
                     {:base => 'https://developer.apple.com/library/prerelease/mac', :lib => '/navigation/library.json'}]
-  
-  attr_accessor :downloaded_files, :dl_dir, :mech, :min_date
-  
+
+  attr_accessor :downloaded_files, :dl_dir, :min_date, :proxy_uri
+
   def initialize(dl_dir, min_date)
     self.dl_dir = dl_dir
     self.min_date = min_date
-    self.mech = Mechanize.new
-    self.mech.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    self.mech.agent.follow_meta_refresh = true
     self.downloaded_files = []
-    
+    self.proxy_uri = nil
+
     if ENV['http_proxy'] || ENV['HTTP_PROXY']
       uri = (ENV['http_proxy']) ? ENV['http_proxy'] : ENV['HTTP_PROXY']
-      parsedUrl = URI.parse(uri)
-      self.mech.set_proxy parsedUrl.host, parsedUrl.port
+      self.proxy_uri = URI.parse(uri)
     end
   end
 
@@ -51,76 +46,62 @@ class WWDCDownloader
     if File.exists?(dir)
       false
     else
-      Dir.mkdir dir 
+      Dir.mkdir dir
       true
     end
   end
 
-  # Login
-  def login
-    wrong_password = true
+  def read_url(url)
+    uri = URI.parse(url)
 
-    while wrong_password do
-      password = ask("Enter your ADC password:  ") { |q| q.echo = "*" }
+    http = nil
 
-      self.mech.get('https://developer.apple.com/membercenter/') do |page|
-        my_page = page.form_with(:name => 'form2') do |f|
-          f.appleId  = ARGV[0]
-          f.accountPassword = password
-        end.click_button
-
-        if my_page.body =~ /incorrect/
-          puts "Wrong password, please try again."
-        else
-          wrong_password = false
-          
-          # do we still need to select a team?
-          if my_page.body =~ /saveTeamSelection/
-            team_form = my_page.form_with(:name => 'saveTeamSelection')
-            
-            # select first team
-            team_select = team_form.field_with(:id => 'teams')
-            team_option = team_select.options[0]
-            team_select.value = team_option
-            
-            puts "Selecting Team #{team_option.text}"
-            
-            button = team_form.button_with(:value => "Continue")
-            team_select_result_page = team_form.click_button(button)
-          end
-        end
-      end
+    if self.proxy_uri
+      http = Net::HTTP.new(uri.host, uri.port, self.proxy_uri.host, self.proxy_uri.port, self.proxy_uri.user, self.proxy_uri.password)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
     end
+
+    http.use_ssl = true
+
+    http.start do |http|
+     request = Net::HTTP::Get.new(uri.request_uri)
+     response = http.request(request)
+
+     if response.code == '200'
+       yield(response.body)
+     end
+   end
   end
-  
+
   def download_sample_code_from_book_json(book_json_url, code_base_url, dest_dir, duplicates_ok)
     did_download = false
-    self.mech.get(book_json_url) do |book_json|
-      if book_json.body[0,1] == '<'
+    self.read_url(book_json_url) do |book_json|
+      if book_json[0,1] == '<'
         puts " Sorry, this samplecode apparently isn't available yet: #{code_base_url}/book.json"
       else
-        book_res = JSON.parse(book_json.body)
+        book_res = JSON.parse(book_json)
         filename = book_res["sampleCode"]
         url = "#{code_base_url}/#{filename}"
-        
+
         did_download = download_file(url, filename, dest_dir, duplicates_ok)
       end
     end
-    
+
     did_download
   end
-  
+
   def download_file(url, filename, dest_dir, duplicates_ok = true)
     did_download = false
-    if duplicates_ok or !self.downloaded_files.include?(url)            
+    if duplicates_ok or !self.downloaded_files.include?(url)
       # remember what we downloaded
       self.downloaded_files << url
 
       puts "  Downloading #{url}"
       begin
-        self.mech.get(url) do |downloaded_file|
+        self.read_url(url) do |downloaded_file|
           open(dest_dir + "/" + filename, 'wb') do |file|
-            file.write(downloaded_file.body)
+            file.write(downloaded_file)
           end
           did_download = true
         end
@@ -130,114 +111,44 @@ class WWDCDownloader
     elsif !duplicates_ok
       puts "  Already downloaded this file, skipping."
     end
-    
-    did_download
-  end
 
-  def download_sample_code_for_page(a_page_url, dest_dir, duplicates_ok = true)
-    self.mech.get(a_page_url) do |page|
-      has_samplecode = false
-      page.links_with(:href => /\.zip/ ).each do |link|         
-        has_samplecode = true
-        #code_base_url = File.dirname(link.href)
-        #download_sample_code_from_book_json("#{code_base_url}/book.json", code_base_url, dest_dir, duplicates_ok)
-        if link.href =~ /(\w+\.zip)$/
-          download_file(link.href, $1, dest_dir, duplicates_ok)
-        else
-          has_samplecode = false
-        end
-      end
-    
-      if !has_samplecode
-        puts "  Sorry, this session doesn't have samplecode, cleaning up."
-        begin
-          Dir.delete(dest_dir)
-        rescue
-        end
-      end
-    
-    end
+    did_download
   end
 
   def load
     mkdir(dl_dir)
-    
-   # get the sessions JSON  
-   #self.mech.get(BASE_URI) do |page|
-   #  res = JSON.parse(page.body)
-   #
-   #  # Was there an error?
-   #  error = res['response']['error']
-   #
-   #  if (error)
-   #    STDERR.puts "  Apple's API returned an error: '#{error}'"
-   #    exit
-   #  end
-   #
-   #  sessions = res['response']['sessions']
-   #
-   #  if sessions.size > 0
-   #
-   #    sessions.each do |session|
-   #      if session['type'] == 'Session'
-   #        title = session['title']
-   #        session_id = session['id']
-   #        puts "Session #{session_id} '#{title}'..."
-   #
-   #        # get the files
-   #        dirname = "#{dl_dir}/#{session_id}-#{title.gsub(/\/|&|!|:/, '')}" 
-   #        puts "  Creating #{dirname}"
-   #        mkdir(dirname)
-   #    
-   #        begin
-   #          download_sample_code_for_page(session['url'], dirname)
-   #        rescue Mechanize::ResponseCodeError => e
-   #          STDERR.puts "  Error retrieving list for session. Proceeding with next session (#{$!})"
-   #          next
-   #        end
-   #      end
-   #    end
-   #  else
-   #    print "No sessions :(.\n"
-   #  end
-   #end
-    
-    # scrape the WWDC libraries... 
+
+    # scrape the WWDC libraries...
     puts
-    puts "Scraping the WWDC libraries (not all sample code might be linked up correctly yet)"
+    puts "Scraping the WWDC libraries..."
     WWDC_LIBRARIES.each do |lib_hash|
       lib = "#{lib_hash[:base]}#{lib_hash[:lib]}"
-      self.mech.get(lib) do |page|
-        body = page.body.gsub("''", '""')
+      puts lib
+      self.read_url(lib) do |body|
+        body = body.gsub("''", '""')
         res = JSON.parse(body)
-        
+
         docs = res['documents']
-        
-        if docs.size > 0
 
+        if docs.size > 0
           docs.each do |doc|
             if doc[2] == 5 and doc[3] >= self.min_date # sample code and newer or equal to min date
               title = doc[0]
-              
+
               puts "Sample Code '#{title}'..."
 
               # get the files
-              dirname = "#{dl_dir}/#{title.gsub(/\/|&|!|:/, '')}" 
+              dirname = "#{dl_dir}/#{title.gsub(/\/|&|!|:/, '')}"
               puts "  Creating #{dirname}"
               did_create_dir = mkdir(dirname)
-              
+
               segments = doc[9].split('/')
               url = "#{lib_hash[:base]}/samplecode/#{segments[2]}/book.json"
 
-              begin     
-                puts url 
-                did_download = download_sample_code_from_book_json(url, "#{lib_hash[:base]}/samplecode/#{segments[2]}", dirname, false)
-                if !did_download and did_create_dir
-                  Dir.delete( dirname )
-                end
-              rescue Mechanize::ResponseCodeError => e
-                STDERR.puts "  Error retrieving list for sample code. Proceeding with next one (#{$!})"
-                next
+              puts url
+              did_download = download_sample_code_from_book_json(url, "#{lib_hash[:base]}/samplecode/#{segments[2]}", dirname, false)
+              if !did_download and did_create_dir
+                Dir.delete( dirname )
               end
             end
           end
@@ -249,26 +160,22 @@ class WWDCDownloader
 
     puts "Done."
   end
-  
+
   def self.run!(*args)
-    puts "WWDC 2014 Session Material Downloader"
+    puts "WWDC 2015 Session Material Downloader"
     puts "by Johannes Fahrenkrug, @jfahrenkrug, springenwerk.com"
     puts "See you next year!"
     puts
+    puts "Usage: wwdcdownloader [<target-dir>]"
+    puts
 
-    if args.size < 1
-      puts "Usage: wwdcdownloader <your Apple ID> [<target-dir>]"
-      exit
-    end
-
-    dl_dir = if args.size > 1 
+    dl_dir = if args.size == 1
       args.last
     else
-      'wwdc2014-assets'
+      'wwdc2015-assets'
     end
-    
-    w = WWDCDownloader.new(dl_dir, '2014-05-28')
-    w.login
+
+    w = WWDCDownloader.new(dl_dir, '2015-06-01')
     w.load
     return 0
   end

data/wwdcdownloader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wwdcdownloader"
-  s.version = "20.14.1"
+  s.version = "20.15.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Fahrenkrug"]
-  s.date = "2014-07-23"
+  s.date = "2015-06-10"
   s.description = "At each year's WWDC, Apple releases great sample projects. Unfortunately it is very tedious to manually download all these treasures through your browser. WWDC-Downloader solves this problem for you!"
   s.email = "johannes@springenwerk.com"
   s.executables = ["wwdcdownloader"]
@@ -37,26 +37,17 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mechanize>, ["~> 2.7.1"])
       s.add_runtime_dependency(%q<json>, ["~> 1.8.0"])
-      s.add_runtime_dependency(%q<highline>, ["~> 1.6.19"])
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.9.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
-      s.add_dependency(%q<mechanize>, ["~> 2.7.1"])
       s.add_dependency(%q<json>, ["~> 1.8.0"])
-      s.add_dependency(%q<highline>, ["~> 1.6.19"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.9.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
-    s.add_dependency(%q<mechanize>, ["~> 2.7.1"])
     s.add_dependency(%q<json>, ["~> 1.8.0"])
-    s.add_dependency(%q<highline>, ["~> 1.6.19"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.9.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wwdcdownloader
 version: !ruby/object:Gem::Version
-  version: 20.14.1
+  version: 20.15.0
 platform: ruby
 authors:
 - Johannes Fahrenkrug
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -38,48 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.19
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement