jsduck 3.9.0 → 3.9.1

data/Rakefile

@@ -27,8 +27,12 @@ def load_sdk_vars
     puts "    OUT_DIR='/path/to/ouput/dir'"
     puts "    # path to SDK (for developers at Sencha)"
     puts "    SDK_DIR='/path/to/SDK'"
-    puts "    # path to Animator (for developers at Sencha)"
+    puts "    # paths to other projects (for developers at Sencha)"
     puts "    ANIMATOR_DIR='/path/to/Animator'"
+    puts "    ARCHITECT_DIR='/path/to/Architect'"
+    puts "    SENCHAIO_DIR='/path/to/IO'"
+    puts "    EXT3_DIR='/path/to/ext3'"
+    puts "    EXT2_DIR='/path/to/ext2'"
     exit 1
   end
 end
@@ -36,7 +40,7 @@ end
 # Compress JS/CSS file in-place
 # Using a hackish way to access yui-compressor
 def yui_compress(fname)
-  system "java -jar $(dirname $(which sencha))/../jsbuilder/ycompressor/ycompressor.jar -o #{fname} #{fname}"
+  system "java -jar $(dirname $(which sencha))/bin/yuicompressor.jar -o #{fname} #{fname}"
 end
 
 # Reads in all CSS files referenced between BEGIN CSS and END CSS markers.
@@ -99,6 +103,7 @@ def compress
   system("sencha", "create", "jsb", "-a", "#{dir}/build-js.html", "-p", "#{dir}/app.jsb3")
   # Concatenate files listed in JSB3 file
   system("sencha", "build", "-p", "#{dir}/app.jsb3", "-d", dir)
+
   # Remove intermediate build files
   system("rm", "#{dir}/app.jsb3")
   system("rm", "#{dir}/all-classes.js")
@@ -132,7 +137,7 @@ def compress
   system "mkdir #{dir}/extjs"
   system "cp template/extjs/ext-all.js #{dir}/extjs"
   system "mkdir -p #{dir}/extjs/resources/themes/images"
-  system "cp -r #{EXT_BUILD}/resources/themes/images/default #{dir}/extjs/resources/themes/images"
+  system "cp -r template/extjs/resources/themes/images/default #{dir}/extjs/resources/themes/images"
 end
 
 
@@ -177,7 +182,8 @@ class JsDuckRunner
   def add_ext4
     @options += [
       "--title", "Sencha Docs - Ext JS 4.0",
-      "--footer", "Ext JS 4.0 Docs - Generated with <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> VERSION. <a href='http://www.sencha.com/legal/terms-of-use/'>Terms of Use</a>",
+      "--footer", "Ext JS 4.0 Docs - Generated with <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> {VERSION}." +
+                  " <a href='http://www.sencha.com/legal/terms-of-use/'>Terms of Use</a>",
       "--ignore-global",
       "--no-warnings",
       "--images", "#{EXT_BUILD}/docs/doc-resources",
@@ -263,7 +269,11 @@ class JsDuckRunner
 
         Docs.otherProducts = [
           {
-              text: 'Ext JS 4',
+              text: 'Ext JS 4.1',
+              href: 'http://docs.sencha.com/ext-js/4-1'
+          },
+          {
+              text: 'Ext JS 4.0',
               href: 'http://docs.sencha.com/ext-js/4-0'
           },
           {
@@ -290,6 +300,10 @@ class JsDuckRunner
               text: 'Sencha Animator',
               href: 'http://docs.sencha.com/animator/1-0'
           },
+          {
+              text: 'Sencha Architect',
+              href: 'http://docs.sencha.com/arhitect/2-0'
+          },
           {
               text: 'Sencha.io',
               href: 'http://docs.sencha.com/io/1-0'
@@ -390,7 +404,7 @@ task :ext3, [:mode] => :sass do |t, args|
   compress if mode == "export"
 
   runner = JsDuckRunner.new
-  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../ext-3.4.0/src/doc-config.json"]
+  runner.add_options ["--output", OUT_DIR, "--config", "#{EXT3_DIR}/src/doc-config.json"]
   runner.add_debug if mode == "debug"
   runner.add_seo if mode == "live"
   runner.add_google_analytics if mode == "live"
@@ -407,7 +421,7 @@ task :ext2, [:mode] => :sass do |t, args|
   compress if mode == "export"
 
   runner = JsDuckRunner.new
-  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../ext-2-source/doc-config.json"]
+  runner.add_options ["--output", OUT_DIR, "--config", "#{EXT2_DIR}/doc-config.json"]
   runner.add_debug if mode == "debug"
   runner.add_seo if mode == "live"
   runner.add_google_analytics if mode == "live"
@@ -454,6 +468,8 @@ task :touch2, [:mode] => :sass do |t, args|
       "--eg-iframe", "#{SDK_DIR}/touch/docs/build-eg-iframe.html",
       "--examples-base-url", "../examples/",
     ]
+  else
+    runner.add_options ["--examples-base-url", "touch/examples/production/"]
   end
 
   runner.add_debug if mode == "debug"
@@ -492,7 +508,7 @@ task :senchaio, [:mode] => :sass do |t, args|
   compress if mode == "live"
 
   runner = JsDuckRunner.new
-  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../client-framework/docs/config.json"]
+  runner.add_options ["--output", OUT_DIR, "--config", "#{SENCHAIO_DIR}/docs/config.json"]
   runner.add_debug if mode == "debug"
   runner.add_seo if mode == "debug" || mode == "live"
   runner.add_google_analytics if mode == "live"
@@ -517,21 +533,21 @@ task :animator, [:mode] => :sass do |t, args|
   runner.run
 end
 
-desc "Run JSDuck on Sencha Designer (for internal use at Sencha)\n" +
-     "designer         - creates debug/development version\n" +
-     "designer[export] - create live version for deployment\n"
-     "designer[live]   - create live version for deployment\n"
-task :designer, [:mode] => :sass do |t, args|
+desc "Run JSDuck on Sencha Architect (for internal use at Sencha)\n" +
+     "architect         - creates debug/development version\n" +
+     "architect[export] - create live version for deployment\n"
+     "architect[live]   - create live version for deployment\n"
+task :architect, [:mode] => :sass do |t, args|
   mode = args[:mode] || "debug"
   throw "Unknown mode #{mode}" unless ["debug", "live", "export"].include?(mode)
   compress if mode == "live"
 
   runner = JsDuckRunner.new
-  runner.add_options ["--output", OUT_DIR, "--config", "#{DESIGNER_DIR}/docs/config.json"]
+  runner.add_options ["--output", OUT_DIR, "--config", "#{ARCHITECT_DIR}/docs/config.json"]
   runner.add_debug if mode == "debug"
   runner.add_seo if mode == "debug" || mode == "live"
   runner.add_google_analytics if mode == "live"
-  runner.add_comments('designer', '2') if mode == "debug" || mode == "live"
+  runner.add_comments('architect', '2') if mode == "debug" || mode == "live"
   runner.run
 end
 

data/jsduck.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.5"
 
   s.name = 'jsduck'
-  s.version = '3.9.0'
-  s.date = '2012-04-17'
+  s.version = '3.9.1'
+  s.date = '2012-04-25'
   s.summary = "Simple JavaScript Duckumentation generator"
   s.description = "Documentation generator for Sencha JS frameworks"
   s.homepage = "https://github.com/senchalabs/jsduck"

data/lib/jsduck/options.rb

@@ -73,7 +73,7 @@ module JsDuck
       ]
       @meta_tag_paths = []
 
-      @version = "3.9.0"
+      @version = "3.9.1"
 
       # Customizing output
       @title = "Sencha Docs - Ext JS"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsduck
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &20825880 !ruby/object:Gem::Requirement
+  requirement: &20844700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20825880
+  version_requirements: *20844700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20825380 !ruby/object:Gem::Requirement
+  requirement: &20842780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20825380
+  version_requirements: *20842780
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &20824860 !ruby/object:Gem::Requirement
+  requirement: &20841760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20824860
+  version_requirements: *20841760
 description: Documentation generator for Sencha JS frameworks
 email: rene.saarsoo@sencha.com
 executables:
@@ -202,6 +202,7 @@ files:
 - template-min/resources/prettify/prettify.css
 - template-min/app.js
 - template-min/print-template.html
+- template-min/data.js
 - template-min/favicon.ico
 - template-min/extjs/resources/themes/images/default/tab/tab-default-bottom-sides.gif
 - template-min/extjs/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif