coherent 0.1.0 → 0.1.1

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.files= Dir['lib/**/*', 'app_generators/**/*', 'generators/**/*', 'bin/*', '[A-Za-z]*', 'vendor/**/*']
     gem.files.reject! { |f| File.directory?(f) }
     gem.add_dependency('distil', '>= 0.7.0')
-    gem.extensions= ['vendor/extconf.rb']
+    # gem.extensions= ['vendor/extconf.rb']
     
     # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app_generators/coherent/coherent_generator.rb

@@ -5,15 +5,14 @@ class CoherentGenerator < CoherentBaseGenerator
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
-  COHERENT_SOURCE = File.expand_path(File.join(File.dirname(__FILE__), "../../vendor/coherent"))
+  COHERENT_URL = ""
+  COHERENT_FOLDER = "ext/coherent"
   
   default_options :author => nil,
-                  :coherent_project => COHERENT_SOURCE,
-                  :copy_coherent => true,
                   :nib_name => 'main'
   
 
-  attr_reader :name, :coherent_project, :copy_coherent, :nib_name
+  attr_reader :name, :nib_name
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -31,11 +30,6 @@ class CoherentGenerator < CoherentBaseGenerator
 
       copy_template_folder m
       m.dependency "nib", [nib_name], :destination=>destination_root
-
-      if (copy_coherent)
-        m.dependency "coherent_library", [], :source=>COHERENT_SOURCE,
-          :destination=>destination_path(coherent_project)
-      end
     end
   end
 
@@ -56,19 +50,11 @@ EOS
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Some comment about this option",
       #         "Default: none") { |o| options[:author] = o }
-      opts.on("-lib", "--lib=\"Location of Coherent Project\"", String,
-              "This is where the Coherent project folder lives",
-              "Default: source from the tools gem") { |o|
-        options[:coherent_project] = o
-      }
       opts.on("-nib", "--nib=\"Name of the Primary NIB\"", String,
               "The name used for the primary NIB for the app.",
               "Default: main") { |o|
         options[:nib_name] = o
       }
-      opts.on("-copy", "--[no-]copy", "Copy the coherent library") { |o|
-        options[:copy_coherent]= o
-      }
       opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
     end
 
@@ -77,13 +63,7 @@ EOS
       # Templates can access these value via the attr_reader-generated methods, but not the
       # raw instance variable value.
       # @author = options[:author]
-      @copy_coherent= options[:copy_coherent]
       @nib_name= options[:nib_name]
-      if (@copy_coherent)
-        @coherent_project= "ext/coherent"
-      else
-        @coherent_project= options[:coherent_project]
-      end
     end
 
     # Installation skeleton.  Intermediate directories are automatically

data/app_generators/coherent/templates/distil.yml.erb

@@ -3,7 +3,8 @@ version: 1.0.0
 notice: src/NOTICE
 output folder: build/res/latest
 remove prefix: src
-external projects: <%=coherent_project%>
+external projects:
+  ext/coherent: http://coherent.googlecode.com/svn/trunk
 
 # This is the main target for your application. This target will yield optimised
 # CSS and Javascript files for all of your assets. In addition, it will emit

data/coherent.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coherent}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-22}
   s.default_executable = %q{coherent}
   s.description = %q{Tools for building Coherent application or modules.}
   s.email = %q{jeff@metrocat.org}
   s.executables = ["coherent"]
-  s.extensions = ["vendor/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -37,8 +36,6 @@ Gem::Specification.new do |s|
      "generators/class/USAGE",
      "generators/class/class_generator.rb",
      "generators/class/templates/@name@.js.erb",
-     "generators/coherent_library/USAGE",
-     "generators/coherent_library/coherent_library_generator.rb",
      "generators/gallery_sample/USAGE",
      "generators/gallery_sample/gallery_sample_generator.rb",
      "generators/gallery_sample/templates/src/nibs/@name@/@name@.css",
@@ -57,10 +54,7 @@ Gem::Specification.new do |s|
      "generators/nib/templates/@name@.css.erb",
      "generators/nib/templates/@name@.html.erb",
      "generators/nib/templates/@name@.jsnib.erb",
-     "lib/coherent.rb",
-     "vendor/Makefile",
-     "vendor/checkout_coherent.sh",
-     "vendor/extconf.rb"
+     "lib/coherent.rb"
   ]
   s.homepage = %q{http://coherentjs.org}
   s.rdoc_options = ["--charset=UTF-8"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coherent
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -08:00
 default_executable: coherent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +26,8 @@ description: Tools for building Coherent application or modules.
 email: jeff@metrocat.org
 executables: 
 - coherent
-extensions: 
-- vendor/extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
@@ -49,8 +49,6 @@ files:
 - generators/class/USAGE
 - generators/class/class_generator.rb
 - generators/class/templates/@name@.js.erb
-- generators/coherent_library/USAGE
-- generators/coherent_library/coherent_library_generator.rb
 - generators/gallery_sample/USAGE
 - generators/gallery_sample/gallery_sample_generator.rb
 - generators/gallery_sample/templates/src/nibs/@name@/@name@.css
@@ -70,9 +68,6 @@ files:
 - generators/nib/templates/@name@.html.erb
 - generators/nib/templates/@name@.jsnib.erb
 - lib/coherent.rb
-- vendor/Makefile
-- vendor/checkout_coherent.sh
-- vendor/extconf.rb
 has_rdoc: true
 homepage: http://coherentjs.org
 licenses: []

data/generators/coherent_library/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/generators/coherent_library/coherent_library_generator.rb

@@ -1,44 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../lib/coherent"
-
-class CoherentLibraryGenerator < CoherentBaseGenerator
-
-  default_options :author => nil
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      copy_template_folder m
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a ...
-
-USAGE: #{$0} #{spec.name} name
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |o| options[:author] = o }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-end

data/vendor/Makefile

@@ -1,4 +0,0 @@
-all:
-
-install: all
-	./checkout_coherent.sh

data/vendor/checkout_coherent.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-cd `dirname $0`
-svn co http://coherent.googlecode.com/svn/trunk coherent
-cd coherent
-distil
-

data/vendor/extconf.rb

@@ -1,3 +0,0 @@
-# Nothing really to do
-
-require "mkmf"