Fingertips-jewelry_portfolio 0.1.1 → 0.2.0

data/README.rdoc

@@ -16,18 +16,29 @@ Jeweler[http://github.com/technicalpickles/jeweler/tree/master] does.
 First things first; create a GitHub pages repository if you haven't done so
 already. See http://github.com/guides/pages for more info.
 
-Then create the following files, and content, in the gh-pages branch of your
+Then create the following files, and content, in the master branch of your
 pages repository (<em>for a more elaborate example see:
-http://github.com/alloy/alloy.github.com/tree/gh-pages</em>):
+http://github.com/alloy/alloy.github.com/tree/master</em>):
 
 * <b>Rakefile:</b>
 
     require 'jewelry_portfolio/tasks'
     JewelryPortfolio::Tasks.new do |t|
-      # Only specify the account if it's different from `github.user' in the git config.
-      t.account = 'Fingertips'
+      t.account     = 'Fingertips'
+      t.name        = 'passengerpane'
+      t.version     = '1.2.0'
+      t.summary     = 'A short summary about the project.'
+      t.description = 'A longer description about the project.'
     end
 
+  The +account+ is only necessary when you haven't configured github.user in
+  the local or global git config. (For more info see:
+  http://github.com/guides/local-github-config.) Or if you want to override the
+  +account+ that was retrieved from the git config.
+  
+  The other attributes are only necessary when there's no gemspec file in the
+  work directory.
+
 * <b>template.html.erb:</b>
 
   This is the main template file which will be used to generate the index.html

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 1
 :major: 0
+:minor: 2
+:patch: 0

data/lib/jewelry_portfolio.rb

@@ -5,21 +5,24 @@ require 'jewelry_portfolio/template'
 class JewelryPortfolio
   class FileMissingError < StandardError; end
   
-  attr_reader :account, :spec, :index, :template
+  attr_reader :account, :repo, :index, :template
   
   # Initializes a JewelryPortfolio instance for the specified +account+.
   #
-  # If an optional +spec+ is provided it will be added to, or updated in, the
-  # index. If no +spec+ is provided it is assumed you are working in a clone of
+  # If an optional +repo+ is provided it will be added to, or updated in, the
+  # index. If no +repo+ is provided it is assumed you are working in a clone of
   # your GitHub pages repo. In this case no fetching and merging will be
   # performed.
-  def initialize(account, spec = nil)
+  def initialize(account, repo = nil)
+    raise ArgumentError, "No `account' given." unless account
+    raise ArgumentError, "No valid `repo' given." if repo && !repo.valid?
+    
     @account  = account
-    @spec     = spec
-    @index    = ReposIndex.new(@account, (Dir.pwd unless @spec))
+    @repo     = repo
+    @index    = ReposIndex.new(@account, (Dir.pwd unless @repo))
     @template = Template.new(File.join(@index.path, 'template'), @index.repos)
     
-    @index.add(@spec) if @spec
+    @index.add(@repo) if @repo
   end
   
   # Renders the index.html file.
@@ -38,8 +41,8 @@ class JewelryPortfolio
   private
   
   def commit_message
-    if @spec
-      "Updated github pages for: #{@spec.name}-#{@spec.version}"
+    if @repo
+      "Updated github pages for: #{@repo.name}-#{@repo.version}"
     else
       "Re-generated github pages"
     end

data/lib/jewelry_portfolio/repo.rb

@@ -1,14 +1,42 @@
 class JewelryPortfolio
   class Repo
-    attr_accessor :spec, :account
+    class InvalidError < StandardError; end
     
-    def initialize(spec, account)
-      @spec, @account = spec, account
+    # The GitHub user account that this repo belongs to.
+    attr_accessor :account
+    
+    # The name of the repo.
+    #
+    # Not needed when initialized with a Gem::Specification.
+    attr_accessor :name
+    
+    # The version of the current version of the project.
+    #
+    # Not needed when initialized with a Gem::Specification.
+    attr_accessor :version
+    
+    # The summary of the project.
+    #
+    # Not needed when initialized with a Gem::Specification.
+    attr_accessor :summary
+    
+    # The description of the project.
+    #
+    # Not needed when initialized with a Gem::Specification.
+    attr_accessor :description
+    
+    def initialize(account = nil, spec = nil)
+      @account = account
+      @gem = !spec.nil?
+      
+      %w{ name version summary description }.each do |attr|
+        send("#{attr}=", spec.send(attr).to_s)
+      end if spec
     end
     
-    # Returns the name of the gem.
-    def name
-      @spec.name
+    # Returns whether or not there's a Ruby gem for this repo.
+    def gem?
+      @gem
     end
     
     # Returns the URL to the project page on GitHub.
@@ -24,7 +52,7 @@ class JewelryPortfolio
     # Returns the name of the gem file from GitHub, which is made up of the
     # account name and the gem name.
     def gem_name
-      "#{@account}-#{name}"
+      "#{@account}-#{@name}"
     end
     
     # Returns the command to install the gem. This is a helper for your views.
@@ -32,12 +60,19 @@ class JewelryPortfolio
       "sudo gem install #{gem_name} -s http://gems.github.com"
     end
     
-    def ==(other)
-      other.is_a?(Repo) && name == other.name
+    # Raises a JewelryPortfolio::Repo::InvalidError if any of: account, name,
+    # version, summary, or description is +nil+.
+    def valid?
+      @account && @name && @version && @summary && @description
+    end
+    
+    def hash
+      @name.hash
     end
     
-    def inspect
-      "#<#{self.class.name} name=\"#{name}\">"
+    def ==(other)
+      other.is_a?(Repo) && hash == other.hash
     end
+    alias_method :eql?, :==
   end
 end

data/lib/jewelry_portfolio/repos_index.rb

@@ -1,5 +1,6 @@
 require 'git'
 require 'rubygems/specification'
+require 'set'
 require 'tempfile'
 require 'yaml'
 
@@ -32,24 +33,17 @@ class JewelryPortfolio
       File.join(path, 'repos.yml')
     end
     
-    def specs
-      unless @specs
+    def repos
+      unless @repos
         load_pages_repo!
-        @specs = File.exist?(repos_file) ? YAML.load(File.read(repos_file)) : []
+        data = File.read(repos_file) if File.exist?(repos_file)
+        @repos = data.nil? || data.empty? ? Set.new : YAML.load(data).to_set
       end
-      @specs
+      @repos
     end
     
-    def repos
-      specs.map { |spec| Repo.new(spec, @account) }
-    end
-    
-    def add(spec)
-      if old_spec = specs.find { |s| s.name == spec.name }
-        specs[specs.index(old_spec)] = spec
-      else
-        specs << spec
-      end
+    def add(repo)
+      @repos = Set.new([repo]).merge(@repos)
       update_repos_file!
     end
     
@@ -59,12 +53,12 @@ class JewelryPortfolio
     end
     
     def push!
-      puts "Pushing branch `gh-pages' to remote `#{url}'"
-      reraise_with_path { pages_repo.push('origin', 'gh-pages') }
+      puts "Pushing branch `master' to remote `#{url}'"
+      reraise_with_path { pages_repo.push('origin', 'master') }
     end
     
     def to_yaml
-      specs.to_yaml
+      repos.to_a.to_yaml
     end
     
     private
@@ -90,9 +84,9 @@ class JewelryPortfolio
         @pages_repo = Git.open(path)
         unless @custom_work_directory
           puts "Pulling `#{url}'"
-          @pages_repo.checkout('gh-pages')
+          @pages_repo.checkout('master')
           @pages_repo.fetch('origin')
-          @pages_repo.merge('origin/gh-pages')
+          @pages_repo.merge('origin/master')
         end
       end
     end
@@ -101,8 +95,8 @@ class JewelryPortfolio
       reraise_with_path do
         puts "Cloning `#{url}'"
         @pages_repo = Git.clone(url, repo_name, :path => File.dirname(path))
-        @pages_repo.checkout('origin/gh-pages')
-        branch = @pages_repo.branch('gh-pages')
+        @pages_repo.checkout('origin/master')
+        branch = @pages_repo.branch('master')
         branch.create
         branch.checkout
       end

data/lib/jewelry_portfolio/tasks.rb

@@ -1,35 +1,35 @@
 require 'jewelry_portfolio'
 
-if defined?(Jeweler)
-  class Jeweler
-    alias_method :release_before_jewelry_portfolio, :release
-    def release
-      release_before_jewelry_portfolio
-      Rake::Task['portfolio:release'].invoke
-    end
+# Add the JewelryPortfolio `portfolio:release' Rake task so it's ran after the
+# original `release' Rake task if it exists.
+if defined?(Rake) && Rake::Task.task_defined?('release')
+  task :release do
+    Rake::Task['portfolio:release'].invoke
   end
 end
 
 class JewelryPortfolio
   class Tasks
-    # Override this if this project is on another account than the one
-    # specified by `github.user' in your global or local git config.
-    attr_accessor :account
+    # The JewelryPortfolio::Repo instance. If a block is given to ::new, this
+    # instance will be yielded.
+    attr_reader :repo
     
-    # Initialize the JewelryPortfolio rake tasks. The instance is yielded so
-    # additional configuration can be performed.
+    # Initialize the JewelryPortfolio rake tasks. A JewelryPortfolio::Repo is
+    # yielded so additional configuration can be performed.
+    #
+    # If the repo you're working in does _not_ contain a +gemspec+ file, then
+    # you'll need to assign all values to the Repo yourself.
     #
     #   JewelryPortfolio::Tasks.new do |t|
-    #     t.account = 'Fingertips'
+    #     t.account     = 'Fingertips'
+    #     t.name        = 'passengerpane'
+    #     t.version     = '1.2.0'
+    #     t.summary     = 'A short summary about the project.'
+    #     t.description = 'A longer description about the project.'
     #   end
     def initialize
-      yield self if block_given?
-      
-      @account ||= github_username
-      unless @account
-        raise ArgumentError, "Unable to determine `account'. Add a github user entry to your global, or local, git config. Or explicitely set the `account' on the JewelryPortfolio::Tasks instance."
-      end
-      
+      @repo = Repo.new(retrieve_github_username, retrieve_gemspec)
+      yield @repo if block_given?
       define
     end
     
@@ -51,17 +51,24 @@ class JewelryPortfolio
     end
     
     def portfolio
-      if @portfolio.nil?
-        if spec_file = Dir.glob('*.gemspec').first
-          spec = eval(File.read(spec_file))
-        end
-        @portfolio = JewelryPortfolio.new(@account, spec)
+      validate_account!
+      @portfolio ||= JewelryPortfolio.new(@repo.account, (@repo if @repo.valid?))
+    end
+    
+    def retrieve_gemspec
+      if spec_file = Dir.glob('*.gemspec').first
+        spec = eval(File.read(spec_file))
       end
-      @portfolio
     end
     
-    def github_username
+    def retrieve_github_username
       Git.open('.').config['github.user']
     end
+    
+    def validate_account!
+      unless @repo.account
+        raise ArgumentError, "Unable to determine `account'. Add a github user entry to your global, or local, git config. Or explicitely set the `account' on the JewelryPortfolio::Tasks instance."
+      end
+    end
   end
 end

data/lib/jewelry_portfolio/template.rb

@@ -3,7 +3,14 @@ require 'erb'
 class JewelryPortfolio
   # This class is responsible for rendering a template.
   class Template
-    attr_reader :template, :repos, :view_path
+    # The full path to the template file.
+    attr_reader :template
+    
+    # The directory in which the template resides.
+    attr_reader :view_path
+    
+    # The array of JewelryPortfolio::Repo instances.
+    attr_reader :repos
     
     # Initialize with the path to the +template+, minus the extensions, and an
     # array of JewelryPortfolio::Repo instances as +repos+.
@@ -11,7 +18,7 @@ class JewelryPortfolio
       template   = File.expand_path(template)
       @view_path = File.dirname(template)
       @template  = html_template_file(File.basename(template))
-      @repos     = repos
+      @repos     = repos.to_a
     end
     
     # Renders the template and returns the output.
@@ -44,7 +51,7 @@ class JewelryPortfolio
     #
     # See partial for more info.
     def repo_partial(repo, local_variables = {})
-      partial 'repo', local_variables.merge(:repo => repo, :spec => repo.spec)
+      partial 'repo', local_variables.merge(:repo => repo)
     end
     
     private

data/test/fixtures/dr-nic-magic-awesome.gemspec_

@@ -5,7 +5,8 @@ Gem::Specification.new do |spec|
   spec.author = 'John Barnette'
   spec.email = 'jbarnette@example.com'
   
-  spec.description = spec.summary = %{ Magically fix your projects overnight! }
+  spec.summary = %{ Magically fix your projects overnight! }
+  spec.description = %{ A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie. }
   
   spec.files = Dir['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*']
   

data/test/fixtures/dr-nic-magic-awesome.html

@@ -1,2 +1,2 @@
     <h1>dr-nic-magic-awesome</h1>
-    <p>Magically fix your projects overnight!</p>
+    <p>A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.</p>

data/test/fixtures/repo.html.erb

@@ -1,2 +1,2 @@
-    <h1><%= spec.name %></h1>
-    <p><%= repo.spec.description %></p>
+    <h1><%= repo.name %></h1>
+    <p><%= repo.description %></p>

data/test/fixtures/repos.yml

@@ -1,109 +1,15 @@
 --- 
-- !ruby/object:Gem::Specification 
+- !ruby/object:JewelryPortfolio::Repo 
+  account: alloy
+  description: A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.
+  gem: true
   name: dr-nic-magic-awesome
-  version: !ruby/object:Gem::Version 
-    version: 1.0.0
-  platform: ruby
-  authors: 
-  - John Barnette
-  autorequire: 
-  bindir: bin
-  cert_chain: []
-
-  date: &id001 2009-02-27 00:00:00 +01:00
-  default_executable: 
-  dependencies: []
-
-  description: Magically fix your projects overnight!
-  email: jbarnette@example.com
-  executables: []
-
-  extensions: []
-
-  extra_rdoc_files: 
-  - README.rdoc
-  - LICENSE
-  - TODO
-  files: []
-
-  has_rdoc: true
-  homepage: 
-  post_install_message: 
-  rdoc_options: 
-  - --charset=utf-8
-  - --main
-  - README.rdoc
-  require_paths: 
-  - lib
-  required_ruby_version: !ruby/object:Gem::Requirement 
-    requirements: &id002 
-      - - ">="
-        - !ruby/object:Gem::Version 
-          version: "0"
-    version: 
-  required_rubygems_version: !ruby/object:Gem::Requirement 
-    requirements: &id003 
-      - - ">="
-        - !ruby/object:Gem::Version 
-          version: "0"
-    version: 
-  requirements: []
-
-  rubyforge_project: 
-  rubygems_version: 1.3.1
-  signing_key: 
-  specification_version: 2
   summary: Magically fix your projects overnight!
-  test_files: []
-
-- !ruby/object:Gem::Specification 
-  name: microgem
-  version: !ruby/object:Gem::Version 
-    version: 0.2.0
-  platform: ruby
-  authors: 
-  - Eloy Duran
-  autorequire: 
-  bindir: bin
-  cert_chain: []
-
-  date: *id001
-  default_executable: 
-  dependencies: []
-
+  version: 1.0.0
+- !ruby/object:JewelryPortfolio::Repo 
+  account: alloy
   description: MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.
-  email: eloy.de.enige@gmail.com
-  executables: 
-  - ugem
-  extensions: []
-
-  extra_rdoc_files: 
-  - README.rdoc
-  - LICENSE
-  - TODO
-  files: []
-
-  has_rdoc: true
-  homepage: 
-  post_install_message: 
-  rdoc_options: 
-  - --charset=utf-8
-  - --main
-  - README.rdoc
-  require_paths: 
-  - lib
-  required_ruby_version: !ruby/object:Gem::Requirement 
-    requirements: *id002
-    version: 
-  required_rubygems_version: !ruby/object:Gem::Requirement 
-    requirements: *id003
-    version: 
-  requirements: []
-
-  rubyforge_project: 
-  rubygems_version: 1.3.1
-  signing_key: 
-  specification_version: 2
+  gem: true
+  name: microgem
   summary: MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.
-  test_files: []
-
+  version: 0.2.0

data/test/fixtures/template.html

@@ -1,7 +1,7 @@
 <html>
   <body>
     <h1>dr-nic-magic-awesome</h1>
-    <p>Magically fix your projects overnight!</p>
+    <p>A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.</p>
     <h1>microgem</h1>
     <p>MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.</p>
   </body>

data/test/jewelry_portfolio_test.rb

@@ -7,15 +7,28 @@ describe "JewelryPortfolio" do
     JewelryPortfolio::ReposIndex.any_instance.stubs(:puts)
     FileUtils.rm_rf(TMP_PAGES_REPO)
     
-    @spec = eval(fixture_read('dr-nic-magic-awesome.gemspec_'))
-    @portfolio = JewelryPortfolio.new('alloy', @spec)
+    @repo = JewelryPortfolio::Repo.new('alloy', eval(fixture_read('dr-nic-magic-awesome.gemspec_')))
+    @portfolio = JewelryPortfolio.new('alloy', @repo)
     
     @portfolio.stubs(:puts)
   end
   
+  it "should raise an ArgumentError if no account is given" do
+    lambda {
+      JewelryPortfolio.new(nil, @repo)
+    }.should.raise ArgumentError
+  end
+  
+  it "should raise a JewelryPortfolio::Repo::InvalidError if the given repo isn't valid" do
+    @repo.version = nil
+    lambda {
+      JewelryPortfolio.new('alloy', @repo)
+    }.should.raise ArgumentError
+  end
+  
   it "should add the spec to the index" do
-    JewelryPortfolio::ReposIndex.any_instance.expects(:add).with(@spec)
-    JewelryPortfolio.new('alloy', @spec)
+    JewelryPortfolio::ReposIndex.any_instance.expects(:add).with(@repo)
+    JewelryPortfolio.new('alloy', @repo)
   end
   
   it "should also initialize without gemspec" do
@@ -26,14 +39,14 @@ describe "JewelryPortfolio" do
   it "should return the local pages repos index" do
     index = @portfolio.index
     index.should.be.instance_of JewelryPortfolio::ReposIndex
-    index.repos.map { |r| r.spec.name }.should == %w{ dr-nic-magic-awesome microgem }
+    index.repos.map { |r| r.name }.should == %w{ dr-nic-magic-awesome microgem }
   end
   
   it "should return the template" do
     template = @portfolio.template
     template.should.be.instance_of JewelryPortfolio::Template
     template.template.should == File.join(@portfolio.index.path, 'template.html.erb')
-    template.repos.should == @portfolio.index.repos
+    template.repos.should == @portfolio.index.repos.to_a
   end
   
   it "should write out the template" do
@@ -41,7 +54,7 @@ describe "JewelryPortfolio" do
     File.read(File.join(@portfolio.index.path, 'index.html')).should == File.read(fixture('template.html'))
   end
   
-  it "should render, commit, and push the `gh-pages' branch" do
+  it "should render, commit, and push the master branch" do
     @portfolio.expects(:render!)
     @portfolio.index.expects(:commit!).with("Updated github pages for: dr-nic-magic-awesome-1.0.0")
     @portfolio.index.expects(:push!)
@@ -61,7 +74,7 @@ describe "JewelryPortfolio, with a custom work_directory" do
     @portfolio.index.instance_variable_get("@custom_work_directory").should == Dir.pwd
   end
   
-  it "should render, commit, and push the `gh-pages' branch" do
+  it "should render, commit, and push the master branch" do
     @portfolio.expects(:render!)
     @portfolio.index.expects(:commit!).with("Re-generated github pages")
     @portfolio.index.expects(:push!)

data/test/repo_test.rb

@@ -1,25 +1,104 @@
 require File.expand_path('../test_helper', __FILE__)
 
-describe "JewelryPortfolio::Repo" do
+module SharedRepoSpecs
+  def self.included(klass)
+    klass.class_eval do
+      it "should return the name of the repo it represents" do
+        @repo.name.should == 'dr-nic-magic-awesome'
+      end
+      
+      it "should return the version of the project" do
+        @repo.version.should == '1.0.0'
+      end
+      
+      it "should return the summary of the project" do
+        @repo.summary.should == 'Magically fix your projects overnight!'
+      end
+      
+      it "should return the description of the project" do
+        @repo.description.should == 'A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.'
+      end
+      
+      it "should return the url to the github project page" do
+        @repo.url.should == 'http://github.com/alloy/dr-nic-magic-awesome/tree/master'
+      end
+      
+      it "should return the public clone url" do
+        @repo.clone_url.should == 'git://github.com/alloy/dr-nic-magic-awesome.git'
+      end
+      
+      it "should return a custom #hash" do
+        @repo.hash.should == 'dr-nic-magic-awesome'.hash
+      end
+      
+      it "should be equal if the name is equal" do
+        other = JewelryPortfolio::Repo.new('alloy')
+        other.name = @repo.name
+        
+        @repo.should == other
+        @repo.should.eql other
+      end
+      
+      it "should not be equal if the name doesn't match" do
+        other = JewelryPortfolio::Repo.new('alloy')
+        other.name = 'other-gem'
+        
+        @repo.should.not == other
+        @repo.should.not.eql other
+      end
+      
+      it "should return itself serialized as YAML" do
+        loaded_repo = YAML.load(@repo.to_yaml)
+        
+        loaded_repo.name.should == @repo.name
+        loaded_repo.version.should == @repo.version
+        loaded_repo.summary.should == @repo.summary
+        loaded_repo.description.should == @repo.description
+      end
+      
+      it "should be valid with all necessary attributes set" do
+        @repo.should.be.valid
+      end
+      
+      it "should not be valid with any of its attributes missing" do
+        %w{ account name version summary description }.each do |attr|
+          repo = @repo.dup
+          repo.send("#{attr}=", nil)
+          
+          repo.should.not.be.valid
+        end
+      end
+    end
+  end
+end
+
+describe "JewelryPortfolio::Repo, when initialized without a gemspec" do
   before do
-    @spec = fixture_eval('dr-nic-magic-awesome.gemspec_')
-    @repo = JewelryPortfolio::Repo.new(@spec, 'alloy')
+    @repo = JewelryPortfolio::Repo.new
+    @repo.account = 'alloy'
+    @repo.name = 'dr-nic-magic-awesome'
+    @repo.version = '1.0.0'
+    @repo.summary = 'Magically fix your projects overnight!'
+    @repo.description = 'A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.'
   end
   
-  it "should return the Gem::Specification instance" do
-    @repo.spec.should == @spec
-  end
+  include SharedRepoSpecs
   
-  it "should return the name of the gem it represents" do
-    @repo.name.should == 'dr-nic-magic-awesome'
+  it "should return that there's _no_ a gem for the repo" do
+    @repo.gem?.should.be false
   end
-  
-  it "should return the url to the github project page" do
-    @repo.url.should == 'http://github.com/alloy/dr-nic-magic-awesome/tree/master'
+end
+
+describe "JewelryPortfolio::Repo, when initialized with a gemspec" do
+  before do
+    @spec = fixture_eval('dr-nic-magic-awesome.gemspec_')
+    @repo = JewelryPortfolio::Repo.new('alloy', @spec)
   end
   
-  it "should return the public clone url" do
-    @repo.clone_url.should == 'git://github.com/alloy/dr-nic-magic-awesome.git'
+  include SharedRepoSpecs
+  
+  it "should return that there's a gem for the repo" do
+    @repo.gem?.should.be true
   end
   
   it "should return the gem name" do
@@ -29,16 +108,4 @@ describe "JewelryPortfolio::Repo" do
   it "should return the gem install command" do
     @repo.gem_install_command.should == "sudo gem install #{@repo.gem_name} -s http://gems.github.com"
   end
-  
-  xit "should return itself serialized as YAML" do
-    @repo.to_yaml.should == fixture_read('dr-nic-magic-awesome_repo.yml')
-  end
-  
-  it "should be equal if the name matches" do
-    JewelryPortfolio::Repo.new(fixture_eval('dr-nic-magic-awesome.gemspec_'), 'alloy').should ==
-      JewelryPortfolio::Repo.new(fixture_eval('dr-nic-magic-awesome.gemspec_'), 'alloy')
-    
-    JewelryPortfolio::Repo.new(fixture_eval('dr-nic-magic-awesome.gemspec_'), 'alloy').should.not ==
-      JewelryPortfolio::Repo.new(fixture_eval('microgem.gemspec_'), 'alloy')
-  end
 end

data/test/repos_index_test.rb

@@ -72,22 +72,20 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     File.should.exist File.join(TMP_PAGES_REPO, 'repos.yml')
   end
   
-  it "should not create a new checkout if it already exists, but do a pull" do
+  it "should not create a new checkout if it already exists, but fetch and merge" do
     @index.pages_repo # make sure it exists
     @index.instance_variable_set("@pages_repo", nil)
     
     Git.expects(:clone).never
-    Git::Base.any_instance.expects(:checkout).with('gh-pages')
+    Git::Base.any_instance.expects(:checkout).with('master')
     Git::Base.any_instance.expects(:fetch).with('origin')
-    Git::Base.any_instance.expects(:merge).with('origin/gh-pages')
+    Git::Base.any_instance.expects(:merge).with('origin/master')
     @index.pages_repo
   end
   
-  it "should create and checkout the `gh-pages' branch" do
+  it "should create and checkout the `master' branch" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
-    @index.pages_repo.branch('gh-pages').should.be.current
-    @index.pages_repo.config('branch.gh-pages.remote').should == 'origin'
-    @index.pages_repo.config('branch.gh-pages.merge').should == 'refs/heads/gh-pages'
+    @index.pages_repo.branch('master').should.be.current
   end
   
   it "should return the pages repo" do
@@ -95,33 +93,33 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     repo.should.be.instance_of Git::Base
   end
   
-  it "should return an array of specs" do
+  xit "should return an array of specs" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     
     @index.specs.each { |s| s.should.be.instance_of Gem::Specification }
     @index.specs.map { |s| s.name }.should == %w{ dr-nic-magic-awesome microgem }
   end
   
-  it "should return an empty array if the repos.yml file does not exist yet" do
+  it "should return an empty set if the repos.yml file does not exist yet" do
     FileUtils.rm(@index.repos_file)
-    @index.specs.should == []
+    @index.repos.should == Set.new
   end
   
-  it "should return an array of repos with their gemspecs" do
+  it "should return a set of repos with their gemspecs" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     
     @index.repos.should == [
-      JewelryPortfolio::Repo.new(fixture_eval('dr-nic-magic-awesome.gemspec_'), 'alloy'),
-      JewelryPortfolio::Repo.new(fixture_eval('microgem.gemspec_'), 'alloy')
-    ]
+      JewelryPortfolio::Repo.new('alloy', fixture_eval('dr-nic-magic-awesome.gemspec_')),
+      JewelryPortfolio::Repo.new('alloy', fixture_eval('microgem.gemspec_'))
+    ].to_set
   end
   
   xit "should serialize the array of repos as YAML" do
     @index.to_yaml.should == fixture_read('repos.yml')
   end
   
-  it "should push the `gh-pages' branch" do
-    @index.pages_repo.expects(:push).with('origin', 'gh-pages')
+  it "should push the to origin/master" do
+    @index.pages_repo.expects(:push).with('origin', 'master')
     @index.push!
   end
   
@@ -139,20 +137,15 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     end
   end
   
-  it "should push the `gh-pages' branch" do
-    @index.pages_repo.expects(:push).with('origin', 'gh-pages')
-    @index.push!
-  end
-  
-  it "should add a new spec to the repos.yml" do
+  it "should add a new repo to the repos.yml" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     @index.repos # make sure its loaded
     
-    spec = eval(fixture_read('dr-nic-magic-awesome.gemspec_').
-      gsub('dr-nic-magic-awesome', 'dr-nic-magic-awesome-v2'))
+    repo = JewelryPortfolio::Repo.new('alloy', eval(fixture_read('dr-nic-magic-awesome.gemspec_').
+                                                gsub('dr-nic-magic-awesome', 'dr-nic-magic-awesome-v2')))
     
     assert_difference('repos_from_file.length', +1) do
-      @index.add(spec)
+      @index.add(repo)
     end
     
     repos_from_file.last.name.should == 'dr-nic-magic-awesome-v2'
@@ -162,10 +155,10 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     @index.repos # make sure its loaded
     
-    spec = eval(fixture_read('dr-nic-magic-awesome.gemspec_').gsub('1.0.0', '1.1.1'))
+    repo = JewelryPortfolio::Repo.new('alloy', eval(fixture_read('dr-nic-magic-awesome.gemspec_').gsub('1.0.0', '1.1.1')))
     
     assert_no_difference('repos_from_file.length') do
-      @index.add(spec)
+      @index.add(repo)
     end
     
     repos_from_file.first.version.to_s.should == '1.1.1'

data/test/tasks_test.rb

@@ -0,0 +1,108 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'jewelry_portfolio/tasks'
+
+module RakeTaskTestHelper
+  class Namespace
+    attr_reader :tasks
+    
+    def initialize(tasks_helper)
+      @tasks = {}
+      @tasks_helper = tasks_helper
+    end
+    
+    def task(name, &block)
+      @tasks[name] = block
+    end
+    
+    def desc(title)
+      # nothing
+    end
+    
+    def method_missing(method, *args, &block)
+      @tasks_helper.send(method, *args, &block)
+    end
+  end
+  
+  def namespace(name, &block)
+    @namespaces ||= {}
+    (@namespaces[name] = Namespace.new(self)).instance_eval(&block)
+  end
+  
+  def namespaces
+    @namespaces
+  end
+end
+
+JewelryPortfolio::Tasks.send(:include, RakeTaskTestHelper)
+
+describe "JewelryPortfolio::Tasks" do
+  before do
+    @tasks_helper = JewelryPortfolio::Tasks.new
+    @tasks_helper.stubs(:portfolio).returns(stub('JewelryPortfolio instance'))
+  end
+  
+  it "should define a portfolio namespace" do
+    @tasks_helper.namespaces.should.has_key :portfolio
+  end
+  
+  it "should define a portfolio:generate task which calls render! on the portfolio instance and opens the index.html file" do
+    @tasks_helper.portfolio.stubs(:index).returns(stub('JewelryPortfolio::ReposIndex', :path => '/path/to/repo'))
+    
+    @tasks_helper.portfolio.expects(:render!)
+    @tasks_helper.expects(:sh).with("open '/path/to/repo/index.html'")
+    
+    @tasks_helper.namespaces[:portfolio].tasks[:generate].call
+  end
+  
+  it "should define a portfolio:release task which calls release! on the portfolio instance" do
+    @tasks_helper.portfolio.expects(:release!)
+    @tasks_helper.namespaces[:portfolio].tasks[:release].call
+  end
+end
+
+describe "JewelryPortfolio::Tasks, in general" do
+  before do
+    Git.stubs(:open).with('.').returns(stub('Git config', :config => { 'github.user' => 'joe_the_plumber' }))
+    
+    @tasks_helper = JewelryPortfolio::Tasks.new
+    @tasks_helper.stubs(:portfolio).returns(stub('JewelryPortfolio instance'))
+  end
+  
+  it "should yield a JewelryPortfolio::Repo when initializing" do
+    repo = nil
+    @tasks_helper = JewelryPortfolio::Tasks.new { |t| repo = t }
+    
+    repo.should.be.instance_of JewelryPortfolio::Repo
+    @tasks_helper.repo.should.be repo
+  end
+  
+  it "should assign the account to use on the repo, from the local/global git config if the user didn't specify one" do
+    @tasks_helper.repo.account.should == 'joe_the_plumber'
+  end
+  
+  it "should raise an ArgumentError if no account could be resolved" do
+    Git.stubs(:open).with('.').returns(stub('Git config', :config => {}))
+    @tasks_helper = JewelryPortfolio::Tasks.new
+    
+    lambda { @tasks_helper.send(:portfolio) }.should.raise ArgumentError
+  end
+  
+  it "should try to find a gemspec file in the current work directory and return a JewelryPortfolio instance with that spec" do
+    Dir.expects(:glob).with('*.gemspec').returns([fixture('dr-nic-magic-awesome.gemspec_')])
+    @tasks_helper = JewelryPortfolio::Tasks.new
+    
+    JewelryPortfolio.expects(:new).with('joe_the_plumber',
+      JewelryPortfolio::Repo.new('joe_the_plumber', fixture_eval('dr-nic-magic-awesome.gemspec_'))).
+        returns('JewelryPortfolio')
+    
+    @tasks_helper.send(:portfolio).should == 'JewelryPortfolio'
+  end
+  
+  it "should not pass the Repo instance if it's not valid" do
+    Dir.stubs(:glob).with('*.gemspec').returns([])
+    @tasks_helper = JewelryPortfolio::Tasks.new
+    
+    JewelryPortfolio.expects(:new).with('joe_the_plumber', nil).returns('JewelryPortfolio')
+    @tasks_helper.send(:portfolio).should == 'JewelryPortfolio'
+  end
+end

data/test/template_test.rb

@@ -1,21 +1,15 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class GemSpecMock
-  attr_accessor :name, :description
-  
-  def initialize(name, description)
-    @name, @description = name, description
-  end
-end
-
 describe "JewelryPortfolio::Template" do
   before do
-    @repos = [
-      JewelryPortfolio::Repo.new(GemSpecMock.new('dr-nic-magic-awesome', "Magically fix your projects overnight!"), 'alloy'),
-      JewelryPortfolio::Repo.new(GemSpecMock.new('microgem', "MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility."), 'alloy')
-    ]
+    @repos = %w{ dr-nic-magic-awesome.gemspec_ microgem.gemspec_ }.
+      map { |spec| JewelryPortfolio::Repo.new('alloy', fixture_eval(spec)) }
     
-    @page = JewelryPortfolio::Template.new(fixture('template'), @repos)
+    @page = JewelryPortfolio::Template.new(fixture('template'), @repos.to_set)
+  end
+  
+  it "should turn the repos set into an array" do
+    @page.repos.should.be.instance_of Array
   end
   
   it "should raise a JewelryPortfolio::FileMissingError if the specified template does not exist" do
@@ -47,7 +41,7 @@ describe "JewelryPortfolio::Template" do
   end
   
   it "should render an ERB partial with the specified local variables" do
-    @page.partial('repo', :repo => @repos.first, :spec => @repos.first.spec).should ==
+    @page.partial('repo', :repo => @repos.first).should ==
       File.read(fixture('dr-nic-magic-awesome.html'))
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Fingertips-jewelry_portfolio
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 -08:00
+date: 2009-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - test/jewelry_portfolio_test.rb
 - test/repo_test.rb
 - test/repos_index_test.rb
+- test/tasks_test.rb
 - test/template_test.rb
 - test/test_helper.rb
 - test/tmp