codefumes 0.1.5 → 0.1.7

data/History.txt

@@ -1,3 +1,11 @@
+== 0.1.7 27-MAR-2010
+
+* Small fixes to Build support
+
+== 0.1.6 09-MAR-2010
+
+* Added simple Build support
+
 == 0.1.5 2009-09-26
 
 * Added visibility support to Claim class

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/cf_release_project/cli.rb
 lib/cf_store_credentials/cli.rb
 lib/codefumes.rb
 lib/codefumes/api.rb
+lib/codefumes/build.rb
 lib/codefumes/claim.rb
 lib/codefumes/commit.rb
 lib/codefumes/config_file.rb
@@ -19,12 +20,14 @@ spec/cf_claim_project/cli_spec.rb
 spec/cf_release_project/cli_spec.rb
 spec/cf_store_credentials/cli_spec.rb
 spec/codefumes/api_spec.rb
+spec/codefumes/build_spec.rb
 spec/codefumes/claim_spec.rb
 spec/codefumes/commit_spec.rb
 spec/codefumes/config_file_spec.rb
 spec/codefumes/payload_spec.rb
 spec/codefumes/project_spec.rb
 spec/codefumes_service_helpers.rb
+spec/fixtures/build.xml
 spec/fixtures/commit.xml
 spec/fixtures/commit_with_custom_attrs.xml
 spec/fixtures/multiple_commits.xml
@@ -34,5 +37,3 @@ spec/fixtures/project_update.xml
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake
-website/index.html
-website/stylesheets/screen.css

data/Rakefile

@@ -24,7 +24,7 @@ $hoe = Hoe.spec('codefumes') do
                          ['rubigen', ">= 1.5.2"],
                          ['fakeweb', ">= 1.2.6"]
                         ]
-  self.extra_deps     = [['httparty','>= 0.4.3']]
+  self.extra_deps     = [['httparty','>= 0.4.3'], ['mojombo-chronic', '>= 0.3.0']]
   developer('Tom Kersten', 'tom.kersten@cosyntech.com')
   developer('Joe Banks', 'freemarmoset@gmail.com')
 end

data/lib/codefumes/build.rb

@@ -0,0 +1,131 @@
+module CodeFumes
+  # A Build represents a specific instance of tests running on
+  # a continuous integration server.  Builds have a name and are
+  # associated with # a specific Commit of a Project and can track
+  # the current status (running, failed, success) and the
+  # start & end times of the Build process.
+  class Build < CodeFumes::API
+    attr_reader   :project_public_key, :project_private_key, :created_at, :api_uri, :identifier, :commit_identifier
+    attr_accessor :started_at, :ended_at, :state, :name
+
+    # Initializes new instance of a Build.
+    #
+    # Accepts an +options+ Hash with support for the following keys:
+    #   :public_key (*)
+    #   :private_key (*)
+    #   :commit_identifier (*)
+    #   :identifier
+    #   :name (*)
+    #   :state
+    #   :api_uri
+    #   :started_at (*)
+    #   :ended_at
+    #
+    #   NOTE:  (*) denotes a required key/value pair
+    def initialize(options = {})
+      @project_public_key  = options[:public_key]        || options['public_key']
+      @project_private_key = options[:private_key]       || options['private_key']
+      @commit_identifier   = options[:commit_identifier] || options['commit_identifier']
+      @identifier          = options[:identifier]        || options['identifier']
+      @name                = options[:name]              || options['name']
+      @state               = options[:state]             || options['state']
+      @api_uri             = options[:api_uri]           || options['api_uri']
+      @started_at          = options[:started_at]        || options['started_at']
+      @ended_at            = options[:ended_at]          || options['ended_at']
+    end
+
+    # Saves the Build instance to CodeFumes.com
+    #
+    # Returns +true+ if successful
+    #
+    # Returns +false+ if request fails
+    def save
+      response = exists? ? update : create
+
+      case response.code
+        when 201,200
+          @identifier = response['build']['identifier']
+          @name       = response['build']['name']
+          @created_at = response['build']['created_at']
+          @started_at = response['build']['started_at']
+          @ended_at   = response['build']['ended_at']
+          @state     = response['build']['state']
+          @api_uri    = response['build']['build_api_uri']
+          @commit_identifier  = response['build']['commit_identifier']
+          @project_public_key  = response['build']['public_key']
+          @project_private_key = response['build']['private_key']
+          true
+        else
+          false
+      end
+    end
+
+    # Searches website for Build with the supplied identifier.
+    #
+    # Returns a Build instance if the Build exists and is available,
+    # to the user making the request.
+    #
+    # Returns +nil+ in all other cases.
+    def self.find(options)
+      uri = "/projects/#{options[:public_key]}/commits/#{options[:commit_identifier]}/builds/#{options[:identifier]}"
+
+      response = get(uri)
+
+      case response.code
+        when 200
+          build_params = response["build"] || {}
+          Build.new(build_params.merge(:private_key => options[:private_key]))
+        else
+          nil
+      end
+    end
+
+
+    # Returns true if the request was successful
+    #
+    # Returns +false+ in all other cases.
+    def destroy
+      uri = "/projects/#{@project_public_key}/commits/#{@commit_identifier}/builds/#{@identifier}"
+      auth_args = {:username => @project_public_key, :password => @project_private_key}
+
+      response = self.class.delete(uri, :basic_auth => auth_args)
+
+      case response.code
+        when 200 : true
+        else false
+      end
+    end
+
+    private
+      # Verifies existence of Build on website.
+      #
+      # Returns +true+ if a build with the specified identifier or name is associated with
+      # the specified project/commit
+      #
+      # Returns +false+ if the public key of the Project is not available.
+      def exists?
+        !self.class.find(:public_key         => @project_public_key,
+                         :commit_identifier  => @commit_identifier,
+                         :identifier         => @identifier || @name,
+                         :private_key        => @project_private_key).nil?
+      end
+
+      # Saves a new build (makes POST request)
+      def create
+        content = standard_content_hash
+        self.class.post("/projects/#{@project_public_key}/commits/#{@commit_identifier}/builds", :query => {:build => content}, :basic_auth => {:username => @project_public_key, :password => @project_private_key})
+      end
+
+      # Updates an existing build (makes PUT request)
+      def update
+        content = standard_content_hash
+        # HACK!
+        searchable_identifier = @identifier || @name
+        self.class.put("/projects/#{@project_public_key}/commits/#{@commit_identifier}/builds/#{searchable_identifier}", :query => {:build => content}, :basic_auth => {:username => @project_public_key, :password => @project_private_key})
+      end
+
+      def standard_content_hash
+        {:name => @name,:started_at => @started_at, :ended_at => @ended_at, :state => @state}
+      end
+  end
+end

data/lib/codefumes.rb

@@ -1,6 +1,8 @@
 require 'httparty'
+require 'chronic'
 
 require 'codefumes/api'
+require 'codefumes/build'
 require 'codefumes/claim'
 require 'codefumes/commit'
 require 'codefumes/config_file'
@@ -8,5 +10,5 @@ require 'codefumes/payload'
 require 'codefumes/project'
 
 module CodeFumes
-  VERSION = '0.1.5'
+  VERSION = '0.1.7' unless defined?(CodeFumes::VERSION)
 end

data/spec/codefumes/api_spec.rb

@@ -14,7 +14,7 @@ describe "API" do
 
   context "switching modes" do
     before(:each) do
-      CodeFumes::API.mode(:test)
+      APIClass.mode(:test)
     end
 
     it "changes the base uri to the test site when switched to test mode" do
@@ -22,17 +22,17 @@ describe "API" do
     end
 
     it "changes the base uri to the production site when switched to production mode" do
-      CodeFumes::API.mode(:production)
+      APIClass.mode(:production)
       APIClass.base_uri.should == 'http://codefumes.com/api/v1/xml'
     end
 
     it "ignores unrecognized modes" do
-      CodeFumes::API.mode(:incomprehensible)
+      APIClass.mode(:incomprehensible)
       APIClass.base_uri.should == 'http://test.codefumes.com/api/v1/xml'
     end
 
     it "changes the base uri to 'localhost:3000' when switched to local mode (for developer testing)" do
-      CodeFumes::API.mode(:local)
+      APIClass.mode(:local)
       APIClass.base_uri.should == 'http://codefumes.com.local/api/v1/xml'
     end
   end

data/spec/codefumes/build_spec.rb

@@ -0,0 +1,119 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "Build" do
+  include CodeFumesServiceHelpers::Build
+
+  after(:all) do
+    FakeWeb.allow_net_connect = false
+    FakeWeb.clean_registry
+  end
+
+  before(:each) do
+    setup_fixture_base
+    setup_build_fixtures
+    @build_params = { :public_key => @pub_key, :private_key => @priv_key,
+                       :name => @build_name, :commit_identifier => @commit_identifier,
+                       :started_at => @started_at, :state => @state}
+
+    @build = Build.new(@build_params)
+  end
+
+  describe "save" do
+    it "sets basic auth with the public and private key" do
+      @build.stub!(:exists?).and_return(false)
+      register_create_uri(["401", "Unauthorized"], "")
+
+      basic_auth_params = {:username => @pub_key, :password => @priv_key}
+
+      build_query = {:build => {:name => @build_name, :ended_at => nil, :started_at => @started_at, :state => @state}}
+      Build.should_receive(:post).with("/projects/#{@project.public_key}/commits/#{@commit_identifier}/builds", :query => build_query, :basic_auth => basic_auth_params).and_return(mock("response", :code => 401))
+      @build.save
+    end
+
+    context "when it's a new build for the specified commit" do
+      before(:each) do
+        @build.stub!(:exists?).and_return(false)
+        register_create_uri(["201", "Created"])
+      end
+
+      it "sets a value for 'created_at'" do
+        @build.created_at.should == nil
+        @build.save.should == true
+        @build.created_at.should_not == nil
+      end
+
+      it "sets a value for 'identifier'" do
+        @build.identifier.should == nil
+        @build.save.should == true
+        @build.identifier.should_not == nil
+      end
+    end
+
+    context "with Unauthorized response" do
+      before(:each) do
+        @build.stub!(:exists?).and_return(false)
+        register_create_uri(["401", "Unauthorized"], "")
+      end
+
+      it "does not set 'created_at'" do
+        @build.created_at.should == nil
+        @build.save.should == false
+        @build.created_at.should == nil
+      end
+    end
+
+    context "when the build already exists on the server" do
+      before(:each) do
+        register_update_uri(["200", "OK"])
+        @build = Build.new(@build_params.merge(:identifier => @build_identifier))
+        Build.stub!(:find).and_return(@build)
+      end
+
+      it "updates the existing build" do
+        mock_response = mock("Response", :code => 200).as_null_object
+        @build.should_receive(:update).and_return(mock_response)
+        @build.save
+      end
+    end
+  end
+
+  describe "find" do
+    before(:each) do
+      setup_fixture_base
+      setup_build_fixtures
+      @find_params = {:public_key => @pub_key,
+                      :commit_identifier => @commit_identifier,
+                      :identifier => @build_identifier}
+    end
+
+    it "returns an instance of Build when found" do
+      register_show_uri(["200", "OK"])
+      returned_object = Build.find(@find_params)
+      returned_object.should  be_instance_of(Build)
+      returned_object.state.should_not be_nil
+    end
+
+    it "returns nil when not found" do
+      register_show_uri(["404", "Not found"])
+      Build.find(@find_params).should be_nil
+    end
+  end
+
+  describe "destroy" do
+    before(:each) do
+      setup_fixture_base
+      setup_build_fixtures
+      @build = Build.new(@build_params.merge(:identifier => @build_identifier))
+    end
+
+    it "returns true when the request returns a status of '200 Ok'" do
+      register_delete_uri(["200", "OK"])
+      @build.destroy.should be_true
+    end
+
+    it "returns false if the status is not '200 Ok'" do
+      register_delete_uri(["500", "Internal Server Error"], "")
+      @build.destroy.should be_false
+    end
+  end
+end

data/spec/codefumes/payload_spec.rb

@@ -42,12 +42,10 @@ describe "Payload" do
         register_create_uri(["401", "Unauthorized"], "")
       end
 
-      [:created_at].each do |method_name|
-        it "sets the '#{method_name.to_s}'" do
-          @payload.send(method_name).should == nil
-          @payload.save.should == false
-          @payload.send(method_name).should == nil
-        end
+      it "does not set 'created_at'" do
+        @payload.created_at.should == nil
+        @payload.save.should == false
+        @payload.created_at.should == nil
       end
     end
 

data/spec/codefumes_service_helpers.rb

@@ -14,6 +14,8 @@ module CodeFumesServiceHelpers
       @updated_name = @project_name + "_updated"
       @commit_data = "commit_data"
       @api_key = "USERS_API_KEY"
+      @build_name = "IE7"
+      @commit_identifier = "COMMIT_IDENTIFIER"
     end
 
     def fixtures
@@ -98,4 +100,34 @@ module CodeFumesServiceHelpers
         FakeWeb.register_uri(:put, request_uri, :status => status_code, :body =>  body_content)
       end
   end
+
+  module Build
+    def setup_build_fixtures
+      @started_at = "2009-09-26 21:18:11 UTC"
+      @esc_started_at = "2009-09-26%2021%3A18%3A11%20UTC"
+      @state = "running"
+      @build_identifier = "BUILD_IDENTIFIER"
+    end
+
+    def register_create_uri(status_code = ["201", "Created"], body_content = fixtures[:build])
+      FakeWeb.register_uri(:post, "#{@authd_project_api_uri}/commits/#{@commit_identifier}/builds?build[state]=#{@state}&build[started_at]=#{@esc_started_at}&build[ended_at]=&build[name]=#{@build_name}",
+                           :status => status_code, :body => body_content)
+    end
+
+    def register_update_uri(status_code = ["200", "Ok"], body_content = fixtures[:build])
+      FakeWeb.register_uri(:put, "#{@authd_project_api_uri}/commits/#{@commit_identifier}/builds/#{@build_identifier}?build[state]=#{@state}&build[started_at]=#{@esc_started_at}&build[ended_at]=&build[name]=#{@build_name}",
+                           :status => status_code, :body => body_content)
+    end
+
+    def register_show_uri(status_code = ["200", "Ok"], body_content = fixtures[:build])
+      FakeWeb.register_uri(:get, "#{@anon_project_api_uri}/commits/#{@commit_identifier}/builds/#{@build_identifier}",
+                           :status => status_code, :body => body_content)
+    end
+
+    def register_delete_uri(status_code = ["200", "Ok"], body_content = fixtures[:project])
+      FakeWeb.register_uri(:delete, "#{@authd_project_api_uri}/commits/#{@commit_identifier}/builds/#{@build_identifier}",
+                           :status => status_code,
+                           :body =>  body_content)
+    end
+  end
 end

data/spec/fixtures/build.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<build>
+  <identifier>BUILD_ID</identifier>
+  <name>IE7</name>
+  <state>running</state>
+  <ended_at></ended_at>
+  <started_at>2009-09-26 21:18:11 UTC</started_at>
+  <created_at>2009-09-26 21:19:11 UTC</created_at>
+  <api_uri>http://codefumes.com/api/v1/xml/projects/public_key_value/commits/COMMIT_IDENTIFIER/builds/BUILD_ID.xml</api_uri>
+</build>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: codefumes
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Tom Kersten
@@ -10,59 +15,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -06:00
+date: 2010-03-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mojombo-chronic
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jscruggs-metric_fu
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rubigen
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-    version: 
+  type: :development
+  version_requirements: *id006
 description: |-
   CodeFumes.com[http://codefumes.com] is a service intended to help people
   involved with software projects who are interested in tracking, sharing,
@@ -106,6 +145,7 @@ files:
 - lib/cf_store_credentials/cli.rb
 - lib/codefumes.rb
 - lib/codefumes/api.rb
+- lib/codefumes/build.rb
 - lib/codefumes/claim.rb
 - lib/codefumes/commit.rb
 - lib/codefumes/config_file.rb
@@ -115,12 +155,14 @@ files:
 - spec/cf_release_project/cli_spec.rb
 - spec/cf_store_credentials/cli_spec.rb
 - spec/codefumes/api_spec.rb
+- spec/codefumes/build_spec.rb
 - spec/codefumes/claim_spec.rb
 - spec/codefumes/commit_spec.rb
 - spec/codefumes/config_file_spec.rb
 - spec/codefumes/payload_spec.rb
 - spec/codefumes/project_spec.rb
 - spec/codefumes_service_helpers.rb
+- spec/fixtures/build.xml
 - spec/fixtures/commit.xml
 - spec/fixtures/commit_with_custom_attrs.xml
 - spec/fixtures/multiple_commits.xml
@@ -130,8 +172,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake
-- website/index.html
-- website/stylesheets/screen.css
 has_rdoc: true
 homepage: http://codefumes.rubyforge.org/codefumes
 licenses: []
@@ -146,18 +186,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: codefumes
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A client-side implementation of the CodeFumes.com API.

data/website/index.html

@@ -1,98 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>codefumes</title>
-    <link href="stylesheets/screen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-    <div id="page">
-      <h1>Official CodeFumes.com Ruby Gems</h1>
-      <p>
-      <a href="http://codefumes.com">CodeFumes.com</a> is a site intended to simplify the process of gathering metrics and associating them with a particular revision of code. The gems described below integrate with this website and are intended to simplify the process of "fleshing out" the pictures you want to draw around your codebase.
-      </p>
-      <h2>Gems</h2>
-      <ul>
-        <li>
-          <ul>
-            <li class="name">codefumes</li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes/wikis">[wiki]</a>
-            </li>
-            <li>
-              <a href="http://codefumes.rubyforge.org/codefumes">[rdoc]</a>
-            </li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes">[repo]</a>
-            </li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes/issues">[bugs/requests]</a>
-            </li>
-            <li>
-              <a href="http://groups.google.com/group/codefumes">[mailing list]</a>
-            </li>
-          </ul>
-          <p class="overview">
-            The 'codefumes' gem is an implementation of the
-            <a href="http://codefumes.com">CodeFumes.com</a> API.
-            The intention of the gem is to simplify integration with CodeFumes.com
-            for developers of other libraries & and applications.
-          </p>
-        </li>
-        <li>
-          <ul>
-            <li class="name">codefumes_harvester</li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes_harvester/wikis">[wiki]</a>
-            </li>
-            <li>
-              <a href="http://codefumes.rubyforge.org/codefumes_harvester">[rdoc]</a>
-            </li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes_harvester">[repo]</a>
-            </li>
-            <li>
-              <a href="http://github.com/cosyn/codefumes_harvester/issues">[bugs/requests]</a>
-            </li>
-            <li>
-              <a href="http://groups.google.com/group/codefumes">[mailing list]</a>
-            </li>
-          </ul>
-          <p class="overview">
-            The codefumes_harvester gem provides a set of high-level tools for gathering
-            history and common metrics from a local repository and sending them to
-            <a href="http://codefumes.com">CodeFumes.com</a>.
-          </p>
-        </li>
-      </ul>
-
-      <h2>Contributing</h2>
-      <p>
-        Improvements in the code and/or documentation are always
-        welcome.  The gems each have a wiki on the Github page
-        (see gem links above).  You can contribute to the code by
-        forking a repository and sending a pull request to Tom
-        Kersten (github handle: tomkersten).
-      </p>
-
-      <h2>Community Discussion/Mailing Lists</h2>
-      <p>
-        General discussion around CodeFumes.com and associated
-        tools/content is welcome on the
-        <a href="http://groups.google.com/group/codefumes">codefumes Google Group</a>
-      </p>
-
-      <h2>Bug reports, Feature Requests</h2>
-      <p>
-        Feel free to use the "Issues" area of the Github repository for
-        this project.  The link for each gem is provided above.
-      </p>
-      <div id="footer">
-        <ul>
-          <li>License</li>
-          <li>(The MIT License)</li>
-          <li>Copyright (C) Tom Kersten, Cosyn Technologies, Inc.</li>
-        </ul>
-      </div>
-    </div>
-  </body>
-</html>

data/website/stylesheets/screen.css

@@ -1,67 +0,0 @@
-body {
-  font-family: "Georgia", sans-serif;
-  font-size: 16px;
-  line-height: 1.6em;
-  padding: 1.6em 0 .9em .9em;
-  color: #333;
-}
-
-#page {
-  width: 942px;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color: #444;
-}
-
-h1 { 
-  font-family: sans-serif;
-  font-weight: normal;
-  font-size: 3em;
-  line-height: 0.8em;
-  letter-spacing: -0.1ex;
-  margin: 5px;
-}
-
-ul {
-  padding-left: 2em;
-}
-
-ul li {
-  padding-bottom: 4em;
-  margin: 0;
-  list-style-type: none;
-}
-
-
-ul li ul {
-  padding: 0;
-  text-align: right;
-}
-
-ul li ul li {
-  display: inline-block;
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-
-ul li.name {
-  font-weight: bold;
-  width: 200px;
-  text-align: left;
-  float: left;
-}
-
-div#footer ul {
-  text-align: right;
-}
-
-div#footer ul li {
-  font-size: .8em;
-  color: #AAA;
-  display: inline-block;
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}