elekk 1.0.1 → 1.0.2

data/.gitignore

@@ -0,0 +1,3 @@
+pkg/*
+.bundle/
+elekk-1.0.2.gem

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    elekk (1.0.2)
+      json
+      memcached
+      nokogiri
+      typhoeus
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    json (1.4.6)
+    memcached (1.0.2)
+    nokogiri (1.4.4)
+    rake (0.8.7)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+    typhoeus (0.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  elekk!
+  json
+  memcached
+  nokogiri
+  rake
+  rspec
+  typhoeus

data/Rakefile

@@ -1,34 +1,10 @@
 require 'rubygems'
 require 'rake'
+require 'spec/rake/spectask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "elekk"
-    s.summary = "A simple library for World of Warcraft data in Ruby."
-    s.email = "agnoster@gmail.com"
-    s.homepage = "http://github.com/agnoster/elekk"
-    s.description = "A simple library for World of Warcraft data in Ruby."
-    s.authors = ["Isaac Wolkerstorfer"]
-    s.files =  FileList["*", "{lib,spec}/**/*"]
-    s.add_dependency 'typhoeus'
-    s.add_dependency 'memcached'
-    s.add_dependency 'nokogiri'
-    s.add_dependency 'json'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+desc "Run all tests"
+Spec::Rake::SpecTask.new('spec') do |t|
+	t.spec_files = FileList['spec/**/*.rb']
+	t.spec_opts = ["--color", "--format", "specdoc"]
+	t.fail_on_error = false
 end
-
-begin
-  require 'spec/rake/spectask'
-  desc "Run all tests"
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/**/*.rb']
-    t.spec_opts = ["--color", "--format", "specdoc"]
-    t.fail_on_error = false
-  end
-rescue LoadError
-  puts "No rspec installed, can't run tests"
-end

data/changelog.md

@@ -1,3 +1,7 @@
+# elekk v1.0.2
+
+ * Switch to simpler gem building with Bundler
+
 # elekk v0.1.0
 
  * Get Achievements

data/elekk.gemspec

@@ -1,72 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "elekk/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{elekk}
-  s.version = "1.0.1"
+  s.name        = "elekk"
+  s.version     = Elekk::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Isaac Wolkerstorfer"]
+  s.email       = ["agnoster@gmail.com"]
+  s.homepage    = "https://github.com/agnoster/elekk"
+  s.summary     = %q{Ruby interface for World of Warcraft data}
+  s.description = %q{Elekk is a Ruby gem that provides an interface to data for Blizzard's highly popular
+  					MMORPG, World of Warcraft. It currently uses data both from Blizzard's official Armory website
+  					at wowarmory.com, as well as the popular community database, WoWhead.com. Future versions may
+  					make use of additional sources of information.}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Isaac Wolkerstorfer"]
-  s.date = %q{2010-07-25}
-  s.description = %q{A simple library for World of Warcraft data in Ruby.}
-  s.email = %q{agnoster@gmail.com}
-  s.files = [
-    "Manifest",
-     "Rakefile",
-     "VERSION",
-     "changelog.md",
-     "elekk.gemspec",
-     "lib/elekk.rb",
-     "lib/elekk/achievement.rb",
-     "lib/elekk/armory.rb",
-     "lib/elekk/character.rb",
-     "lib/elekk/data.rb",
-     "lib/elekk/http.rb",
-     "lib/elekk/wowhead.rb",
-     "readme.md",
-     "spec/achievement_spec.rb",
-     "spec/armory_spec.rb",
-     "spec/character_spec.rb",
-     "spec/klass_spec.rb",
-     "spec/test.rb",
-     "spec/wowhead_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/agnoster/elekk}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A simple library for World of Warcraft data in Ruby.}
-  s.test_files = [
-    "spec/achievement_spec.rb",
-     "spec/armory_spec.rb",
-     "spec/character_spec.rb",
-     "spec/klass_spec.rb",
-     "spec/test.rb",
-     "spec/wowhead_spec.rb"
-  ]
+  s.rubyforge_project = "elekk"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'json'
+  s.add_dependency 'typhoeus'
+  s.add_dependency 'memcached'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
-      s.add_runtime_dependency(%q<memcached>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<typhoeus>, [">= 0"])
-      s.add_dependency(%q<memcached>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<typhoeus>, [">= 0"])
-    s.add_dependency(%q<memcached>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-  end
-end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/elekk.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+require 'bundler/setup'
+
 require 'nokogiri'
 
 module Elekk

data/lib/elekk/armory.rb

@@ -17,8 +17,8 @@ module Elekk
       @region ||= Elekk::default_region
     end
 
-    def character(name)
-      Character.new name, @realm, :region => @region, :armory => self
+    def character(name, realm=@realm)
+      Character.new name, realm, :region => @region, :armory => self
     end
 
     def base

data/lib/elekk/version.rb

@@ -0,0 +1,3 @@
+module Elekk
+  VERSION = "1.0.2"
+end

data/spec/armory_spec.rb

@@ -35,6 +35,9 @@ describe Armory do
   it "should build URLs relative to the server" do
     @armory.url('character-sheet.xml').should == 'http://us.wowarmory.com/character-sheet.xml';
   end
+
+  it "should be able to reach the Armory" do
+  end
   
   it "should get XML from the armory" do
     xml = @armory.get_xml 'character-sheet', :r => 'Uldaman', :cn => 'Fyrbard'
@@ -50,4 +53,4 @@ describe Armory do
     feed = @armory.get_feed ['Aldea', 'Alassiel', 'Puya', 'Ultimohombre', 'Fyrbard']
   end
   
-end
+end

data/spec/character_spec.rb

@@ -5,6 +5,7 @@ describe Character do
   before :each do
     @armory = Armory.new 'Uldaman', :us
     @fyrbard = @armory.character 'Fyrbard'
+    @karzhak = @armory.character 'Karzhak', 'Farstriders'
     @aldea = Character.new 'Aldea', 'Uldaman'
   end
   
@@ -36,17 +37,17 @@ describe Character do
   it "should have the right class" do
     @fyrbard.klass.should == Klass::Priest
     @aldea.klass.should == Klass::Warrior
-    @armory.character('Ultimohombre').klass.should == Klass::DeathKnight
+    @karzhak.klass.should == Klass::DeathKnight
   end
   
   it "should have the right level" do
-    @fyrbard.level.should == 80
+    @karzhak.level.should == 58
     @armory.character('Harimad').level.should == 16
   end
   
   it "should have the right faction" do
     @fyrbard.faction.should == Faction::Alliance
-    @armory.character('Tabularasa').faction.should == Faction::Horde
+    @karzhak.faction.should == Faction::Horde
   end
   
   it "should have the right race" do
@@ -63,7 +64,7 @@ describe Character do
   
   it "should have the right specs" do
     @fyrbard.spec(0).should == TalentTree::Priest::Shadow
-    @fyrbard.spec(1).should == TalentTree::Priest::Holy
+    @fyrbard.spec(1).should == TalentTree::Priest::Discipline
     @aldea.spec(:active).should == TalentTree::Warrior::Protection
     @armory.character('Alassiel').spec(0).should == TalentTree::Hunter::BeastMastery
     @armory.character('Alassiel').spec(0).name.should == 'Beast Mastery'
@@ -71,15 +72,14 @@ describe Character do
   end
   
   it "should have the right points" do
-    @fyrbard.points.should >= 4000
-    @fyrbard.points.should <= 5000
+    @karzhak.points.should == 130
   end
   
   it "should have the right title" do
-    @fyrbard.fullname.should == 'Fyrbard of the Ashen Verdict'
-    @aldea.fullname.should == 'Aldea of the Nightfall'
-    @aldea.fullname(:strong).should == '<strong>Aldea</strong> of the Nightfall'
-    @fyrbard.fullname('').should == 'Fyrbard of the Ashen Verdict'
+    @fyrbard.fullname.should == 'Fyrbard the Hallowed'
+    @aldea.fullname.should == 'Aldea the Diplomat'
+    @aldea.fullname(:strong).should == '<strong>Aldea</strong> the Diplomat'
+    @fyrbard.fullname('').should == 'Fyrbard the Hallowed'
     @armory.character('Bitterleaf').fullname('strong').should == 'Loremaster <strong>Bitterleaf</strong>'
   end
   

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: elekk
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Isaac Wolkerstorfer
@@ -15,67 +14,94 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 +02:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: typhoeus
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: memcached
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: typhoeus
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: memcached
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: A simple library for World of Warcraft data in Ruby.
-email: agnoster@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: |-
+  Elekk is a Ruby gem that provides an interface to data for Blizzard's highly popular
+    					MMORPG, World of Warcraft. It currently uses data both from Blizzard's official Armory website
+    					at wowarmory.com, as well as the popular community database, WoWhead.com. Future versions may
+    					make use of additional sources of information.
+email: 
+- agnoster@gmail.com
 executables: []
 
 extensions: []
@@ -83,9 +109,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Manifest
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - Rakefile
-- VERSION
 - changelog.md
 - elekk.gemspec
 - lib/elekk.rb
@@ -94,21 +121,21 @@ files:
 - lib/elekk/character.rb
 - lib/elekk/data.rb
 - lib/elekk/http.rb
+- lib/elekk/version.rb
 - lib/elekk/wowhead.rb
 - readme.md
 - spec/achievement_spec.rb
 - spec/armory_spec.rb
 - spec/character_spec.rb
 - spec/klass_spec.rb
-- spec/test.rb
 - spec/wowhead_spec.rb
 has_rdoc: true
-homepage: http://github.com/agnoster/elekk
+homepage: https://github.com/agnoster/elekk
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -116,7 +143,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -125,21 +151,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: elekk
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A simple library for World of Warcraft data in Ruby.
+summary: Ruby interface for World of Warcraft data
 test_files: 
 - spec/achievement_spec.rb
 - spec/armory_spec.rb
 - spec/character_spec.rb
 - spec/klass_spec.rb
-- spec/test.rb
 - spec/wowhead_spec.rb

data/Manifest

@@ -1,14 +0,0 @@
-CHANGELOG
-Rakefile
-lib/elekk.rb
-lib/elekk/armory.rb
-lib/elekk/character.rb
-lib/elekk/data.rb
-lib/elekk/http.rb
-lib/elekk/wowhead.rb
-readme.md
-spec/armory_spec.rb
-spec/character_spec.rb
-spec/klass_spec.rb
-spec/wowhead_spec.rb
-Manifest

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/spec/test.rb

@@ -1,7 +0,0 @@
-require '../lib/elekk.rb'
-
-@armory = Elekk::Armory.new 'Uldaman'
-@feeds = @armory.get_feeds ['Fyrbard', 'Aldea', 'Alassiel', 'Ultimohombre', 'Puya', 'Wulffe', 'Silinix', 'Katalia', 'Hdarkone', 'Gleanna', 'Stormrazor', 'Gracasta']
-@collated = @armory.collate_feeds @feeds
-
-@collated.each { |k,v| puts v.first[:title]; v.each {|e| puts e[:character]}; puts }