guides 0.6.8.1 → 0.6.9

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 group :development do
   gem "rspec", "~> 2.0"
   gem "faraday", "~> 0.5.0"
+  gem "packager"
 end

data/Rakefile

@@ -1,127 +1,16 @@
-require "bundler/setup"
-require "guides/version"
-require "erb"
+require File.expand_path('../lib/guides/version', __FILE__)
 
-file "Guides/local/guides/bundle" => "Gemfile" do
-  require "rbconfig"
+begin
+  require 'packager/rake_task'
 
-  unless Config::CONFIG["target_cpu"] == "universal"
-    puts "Please use a universal binary copy of ruby"
-    exit 1
+  Packager::RakeTask.new(:pkg) do |t|
+    t.version = Guides::VERSION
+    t.domain = "strobecorp.com"
+    t.package_name = "Guides"
+    t.bin_files = ['guides']
   end
-
-  unless RUBY_VERSION == "1.9.2"
-    puts "Please use Ruby 1.9.2"
-    exit 1
-  end
-
-  puts "Regenerating the bundle."
-
-  sh "rm -rf bundle"
-  Bundler.with_clean_env do
-    sh "bundle --standalone --local --without development"
-  end
-  sh "mkdir -p Guides/local/guides"
-  sh "cp -R bundle Guides/local/guides/"
-
-  verbose(false) do
-    Dir.chdir("Guides/local/guides/bundle/ruby/1.9.1") do
-      Dir["{bin,cache,doc,specifications}"].each { |f| rm_rf f }
-      Dir["**/{ext,docs,test,spec}"].each { |f| rm_rf(f) if File.directory?(f) && f !~ /maruku/i }
-      Dir["**/erubis-*/doc-api"].each {|f| rm_rf(f) }
-    end
+rescue LoadError
+  if Rake.application.options.show_tasks
+    puts "`gem install packager` for packaging tasks"
   end
 end
-
-file "Guides/local/guides/lib"
-
-`git ls-files -- lib`.split("\n").each do |file|
-  dest = "Guides/local/guides/#{file}"
-  file dest => file do
-    verbose(false) { mkdir_p File.dirname(dest) }
-    cp_r file, dest
-  end
-  task "Guides/local/guides/lib" => dest
-end
-
-file "Guides/bin/guides" => "bin/guides" do
-  guides = File.read("bin/guides").sub(/\A#.*/, "#!/usr/local/ruby1.9/bin/ruby -I /usr/local/guides/bundle -r bundler/setup")
-
-  sh "mkdir -p Guides/bin"
-  File.open("Guides/bin/guides", "w") { |file| file.puts guides }
-  File.chmod 0755, "Guides/bin/guides"
-end
-
-desc "Prep the release for PackageMaker"
-task :make_pkg => ["Guides/local/guides/bundle", "Guides/local/guides/lib", "Guides/bin/guides"]
-
-task :rm do
-  rm_rf "Guides"
-end
-
-directory "guides-pkg/Resources"
-directory "guides-pkg/guides.pkg"
-
-pkg_dependencies = [:make_pkg, "guides-pkg/Resources", "guides-pkg/guides.pkg",
-  "guides-pkg/Distribution", "guides-pkg/guides.pkg/Bom",
-  "guides-pkg/guides.pkg/PackageInfo", "guides-pkg/guides.pkg/Payload"]
-
-def details
-  @details ||= begin
-    total_size, files = 0, 0
-
-    Dir["Guides/**/*"].each do |file|
-      files += 1
-
-      next if File.directory?(file)
-
-      total_size += File.size(file)
-    end
-
-    [total_size, files]
-  end
-end
-
-file "guides-pkg/Distribution" do
-  src = File.read File.expand_path("../build/Distribution.erb", __FILE__)
-  erb = ERB.new(src)
-
-  total_size, files = details
-
-  kbytes = total_size / 1024
-  version = Guides::VERSION
-
-  File.open("guides-pkg/Distribution", "w") do |file|
-    file.puts erb.result(binding)
-  end
-end
-
-file "guides-pkg/guides.pkg/PackageInfo" do
-  src = File.read File.expand_path("../build/PackageInfo.erb", __FILE__)
-  erb = ERB.new(src)
-
-  total_size, num_files = details
-
-  kbytes = total_size / 1024
-  version = Guides::VERSION
-
-  File.open("guides-pkg/guides.pkg/PackageInfo", "w") do |file|
-    file.puts erb.result(binding)
-  end
-end
-
-file "guides-pkg/guides.pkg/Bom" do
-  sh "mkbom -s Guides guides-pkg/guides.pkg/Bom"
-end
-
-file "guides-pkg/guides.pkg/Payload" do
-  sh "cd Guides && pax -wz -x cpio . > ../guides-pkg/guides.pkg/Payload"
-end
-
-file "Guides.pkg" => pkg_dependencies do
-  sh "pkgutil --flatten guides-pkg Guides.pkg"
-end
-
-task :pkg => "Guides.pkg"
-
-task :clean => [:rm, :pkg]

data/lib/guides/generator.rb

@@ -195,11 +195,7 @@ module Guides
     end
 
     def set_index(body, view, processor)
-      index = <<-INDEX
-      <div id="subCol">
-        <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
-        <ol class="chapters">
-      INDEX
+      index = ""
 
       i = Indexer.new(body, warnings, @production)
       i.index
@@ -223,9 +219,6 @@ module Guides
         index << view.content_tag(:li, link.html_safe + children_ul.html_safe)
       end
 
-      index << '</ol>'
-      index << '</div>'
-
       view.content_for(:index_section) { index.html_safe }
 
       i.result

data/lib/guides/helpers.rb

@@ -50,7 +50,7 @@ module Guides
       result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name)
       result << content_tag(:h3, name)
       result << content_tag(:p, capture(&block))
-      content_tag(:div, result, :class => 'clearfix', :id => nick)
+      content_tag(:div, result, :class => 'author clearfix', :id => nick)
     end
 
     def code(&block)

data/lib/guides/templates/source/layout.html.erb

@@ -54,7 +54,10 @@
       <h2><%= Guides.meta["title"] %></h2>
       <p><%= Guides.meta["description"] %></p>
     <% end %>
-      <%= yield(:index_section) %>
+      <div id="subCol">
+        <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
+        <ol class="chapters"><%= yield(:index_section) %></ol>
+      </div>
     </div>
   </div>
 

data/lib/guides/version.rb

@@ -1,3 +1,3 @@
 module Guides
-  VERSION = "0.6.8.1"
+  VERSION = "0.6.9"
 end

metadata

@@ -2,7 +2,7 @@
 name: guides
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.8.1
+  version: 0.6.9
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -103,8 +103,6 @@ files:
 - Gemfile
 - Rakefile
 - bin/guides
-- build/Distribution.erb
-- build/PackageInfo.erb
 - guides.gemspec
 - lib/guides.rb
 - lib/guides/cli.rb
@@ -256,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guides
-rubygems_version: 1.7.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Extracting the Rails Guides framework for the rest of us

data/build/Distribution.erb

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<installer-script minSpecVersion="1.000000" authoringTool="org.ruby-lang.rake" authoringToolVersion="0.8.7">
-  <title>Guides</title>
-  <options customize="never" allow-external-scripts="no"/>
-  <domains enable_localSystem="true"/>
-  <script>
-    function ruby19p136_installed() {
-      return !(system.files.fileExistsAtPath('/usr/local/ruby1.9') == true);
-    }
-  </script>
-  <choices-outline>
-    <line choice="ruby19p136"/>
-    <line choice="guides"/>
-  </choices-outline>
-  <choice id="ruby19p136" title="ruby" start_selected="false" start_enabled="false" selected="ruby19p136_installed()" enabled="ruby19p136_installed()">
-    <pkg-ref id="com.strobecorp.ruby19"/>
-  </choice>
-  <choice id="guides" title="Guides">
-    <pkg-ref id="com.strobecorp.guides"/>
-  </choice>
-  <pkg-ref id="com.strobecorp.ruby19" installKBytes="26156" archiveKBytes="7353" hash-sha256="7b9507f7a9178c0eaafd3ffcfd2e246400e82899e6f29df2f7c4fcec6ec04ac5" version="1.9.2p136" auth="Root">http://ruby-pkg.strobeapp.com/Ruby-1.9.2p136.pkg</pkg-ref>
-  <pkg-ref id="com.strobecorp.guides" installKBytes="<%= kbytes %>" version="<%= version %>" auth="Root">#guides.pkg</pkg-ref>
-</installer-script>

data/build/PackageInfo.erb

@@ -1,4 +0,0 @@
-<pkg-info format-version="2" identifier="com.strobecorp.guides" version="<%= version %>" install-location="/usr" auth="root">
-  <payload installKBytes="<%= kbytes %>" numberOfFiles="<%= num_files %>"/>
-</pkg-info>
-