jsus 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,5 +1,9 @@
 = Jsus Changelog
 
+== Version 0.1.4
+* Switched from OptiFlag to Choice for command-line parsing in jsus utility
+* Miscellanous changes here and there
+
 == Version 0.1.3
 * Updated Pool class with dependency resolvers
 * Added Package#include_external_dependencies!

data/Manifest

@@ -5,7 +5,6 @@ README
 Rakefile
 TODO
 bin/jsus
-jsus.gemspec
 lib/jsus.rb
 lib/jsus/container.rb
 lib/jsus/package.rb

data/Rakefile

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
-Echoe.new('jsus', '0.1.3') do |g|
+Echoe.new('jsus', '0.1.4') do |g|
   g.description    = "Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info."
   g.url            = "http://github.com/markiz/jsus"
   g.author         = "Markiz, idea by Inviz (http://github.com/Inviz)"
   g.email          = "markizko@gmail.com"
   g.ignore_pattern = ["nbproject/**/*", 'spec/*/public/**/*']
-  g.runtime_dependencies   = ["activesupport", "json_pure", "rgl", "optiflag"]
+  g.runtime_dependencies   = ["activesupport", "json_pure", "rgl", "choice"]
   g.development_dependencies = ["rake"]
   g.use_sudo       = false
 end

data/bin/jsus

@@ -1,47 +1,50 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'jsus'
-require 'optiflag'
+require 'choice'
 
-module JsusCL
-  extend OptiFlagSet
 
-  flag "input_directory" do
-    alternate_forms "i"
-    description "Path to directory containing your package to compile."
+Choice.options do
+  option 'input_directory', :required => true do
+    short "-i"
+    long "--input-directory=DIRECTORY"
+    desc "Path to directory containing your package to compile."
   end
 
-  flag "output_directory" do
-    alternate_forms "o"
-    description "Path to directory to output the compiled package."
+  option 'output_directory', :required => true do
+    short "-o"
+    long "--output-directory=DIRECTORY"
+    desc "Path to directory to output the compiled package."
   end
-
-  optional_flag "dependencies" do
-    alternate_forms "d"
-    description "Path to directory containing packages this package relies on. " <<
-                "If set, all the packages will be compiled into a single file"
+  
+  option "dependencies", :required => false do
+    short "-d"
+    long  "--with-dependencies=DIRECTORY"
+    desc "Path to directory containing packages this package relies on. " <<
+         "If set, all the packages will be compiled into a single file."
   end
 
-  optional_flag "scripts_info" do
-    default "yes"
-    description "Generates scripts.json file with general info about your package"
-    value_in_set ["yes", "no"]
+  option "without_scripts_info", :required => false do
+    long "--without-scripts-info"
+    desc "When this flag is set, jsus doesn't generate scripts.json" <<
+         "file with general info about your package."
   end
 
-  optional_flag "tree_info" do
-    default "yes"
-    description "Generates scripts.json file with tree structure of your package"
-    value_in_set ["yes", "no"]
+  option "without_tree", :required => false do
+    long "--without-tree"
+    desc "When this flag is set, jsus doesn't generate tree.json file" <<
+         "with tree structure of your package."
   end
 
-  and_process!
 end
 
-pool = if JsusCL.flags.dependencies?
-  Jsus::Pool.new(JsusCL.flags.dependencies)
+
+pool = if Choice.choices[:dependencies]
+  Jsus::Pool.new(Choice.choices[:dependencies])
 end
-package = Jsus::Package.new(JsusCL.flags.input_directory, :pool => pool)
-package.include_dependencies! if JsusCL.flags.dependencies?
-package.compile(JsusCL.flags.output_directory)
-package.generate_scripts_info(JsusCL.flags.output_directory) if JsusCL.flags.scripts_info == "yes"
-package.generate_tree(JsusCL.flags.output_directory) if JsusCL.flags.scripts_info == "yes"
+package = Jsus::Package.new(Choice.choices[:input_directory], :pool => pool)
+package.include_dependencies! if Choice.choices[:dependencies]
+output_directory = Choice.choices[:output_directory]
+package.compile(output_directory)
+package.generate_scripts_info(output_directory) unless Choice.choices[:without_scripts_info]
+package.generate_tree(output_directory) unless Choice.choices[:without_tree]

data/jsus.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markiz, idea by Inviz (http://github.com/Inviz)"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-06-07}
   s.default_executable = %q{jsus}
   s.description = %q{Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.}
   s.email = %q{markizko@gmail.com}
   s.executables = ["jsus"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "jsus.gemspec", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/ChainDependencies/app/javascripts/Class/Source/Class.js", "spec/data/ChainDependencies/app/javascripts/Class/package.yml", "spec/data/ChainDependencies/app/javascripts/Hash/Source/Hash.js", "spec/data/ChainDependencies/app/javascripts/Hash/package.yml", "spec/data/ChainDependencies/app/javascripts/Mash/Source/Mash.js", "spec/data/ChainDependencies/app/javascripts/Mash/package.yml", "spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js", "spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml", "spec/data/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/container_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/packager_spec.rb", "spec/lib/jsus/pool_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/lib/jsus/topsortable_spec.rb", "spec/shared/class_stubs.rb", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/ChainDependencies/app/javascripts/Class/Source/Class.js", "spec/data/ChainDependencies/app/javascripts/Class/package.yml", "spec/data/ChainDependencies/app/javascripts/Hash/Source/Hash.js", "spec/data/ChainDependencies/app/javascripts/Hash/package.yml", "spec/data/ChainDependencies/app/javascripts/Mash/Source/Mash.js", "spec/data/ChainDependencies/app/javascripts/Mash/package.yml", "spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js", "spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml", "spec/data/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/container_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/packager_spec.rb", "spec/lib/jsus/pool_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/lib/jsus/topsortable_spec.rb", "spec/shared/class_stubs.rb", "spec/spec.opts", "spec/spec_helper.rb", "jsus.gemspec"]
   s.homepage = %q{http://github.com/markiz/jsus}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jsus", "--main", "README"]
   s.require_paths = ["lib"]
@@ -28,20 +28,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_runtime_dependency(%q<rgl>, [">= 0"])
-      s.add_runtime_dependency(%q<optiflag>, [">= 0"])
+      s.add_runtime_dependency(%q<choice>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<rgl>, [">= 0"])
-      s.add_dependency(%q<optiflag>, [">= 0"])
+      s.add_dependency(%q<choice>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<rgl>, [">= 0"])
-    s.add_dependency(%q<optiflag>, [">= 0"])
+    s.add_dependency(%q<choice>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/lib/jsus/package.rb

@@ -38,8 +38,7 @@ module Jsus
     end
 
     def provides
-      source_files.map {|source| source.provides(:short => true) }.flatten +
-        external_dependencies.map {|d| d.provides }.flatten
+      (source_files.map {|source| source.provides(:short => true) } + linked_external_dependencies.map {|d| d.provides }).flatten
     end
 
     def files
@@ -53,11 +52,15 @@ module Jsus
     end
 
     def external_dependencies
-      @external_dependencies ||= Container.new
+      source_files.map {|source| source.external_dependencies }
     end
 
-    def external_dependencies=(new_value)
-      @external_dependencies = new_value
+    def linked_external_dependencies
+      @linked_external_dependencies ||= Container.new
+    end
+
+    def linked_external_dependencies=(new_value)
+      @linked_external_dependencies = new_value
     end
 
     def description
@@ -65,7 +68,7 @@ module Jsus
     end    
 
     def compile(directory = ".")
-      Packager.new(*(source_files.to_a + external_dependencies.to_a)).pack(File.join(directory, filename))
+      Packager.new(*(source_files.to_a + linked_external_dependencies.to_a)).pack(File.join(directory, filename))
     end
 
     def generate_tree(directory = ".", filename = "tree.json")
@@ -94,7 +97,7 @@ module Jsus
 
     def include_dependencies!
       source_files.each do |source|
-        self.external_dependencies << pool.lookup_dependencies(source)
+        linked_external_dependencies << pool.lookup_dependencies(source)
       end
     end
 

data/lib/jsus/pool.rb

@@ -26,23 +26,24 @@ module Jsus
       when Jsus::SourceFile
         source_or_key
       else
-        raise "Illegal lookup query. Expected String or SourceFile, given #{source_or_key.class.name}."
+        raise "Illegal lookup query. Expected String or SourceFile, " <<
+              "given #{source_or_key.inspect}, an instance of #{source_or_key.class.name}."
       end
     end
 
     def lookup_direct_dependencies(source_or_source_key)
       source = lookup(source_or_source_key)
-      result = source.dependencies(:short => true).select {|d| d =~ %r(/)}.map {|d| lookup(d)}
+      result = source.external_dependencies.map {|d| lookup(d)}
       Container.new(*result)
     end
 
     def lookup_dependencies(source_or_source_key)
       source = lookup(source_or_source_key)
       result = Container.new
-      dependencies = lookup_direct_dependencies(source).to_a
+      dependencies = lookup_direct_dependencies(source)
       while !dependencies.empty?
         dependencies.each { |d| result.push(d) }
-        dependencies = dependencies.map {|d| lookup_direct_dependencies(d).to_a }.flatten.compact.uniq
+        dependencies = dependencies.map {|d| lookup_direct_dependencies(d).to_a }.flatten.uniq
       end
       result.sort!
     end

data/lib/jsus/source_file.rb

@@ -1,6 +1,5 @@
 module Jsus
   class SourceFile
-    attr_accessor :header
     attr_accessor :relative_filename
     attr_accessor :filename
     attr_accessor :content
@@ -35,9 +34,21 @@ module Jsus
     end
 
     # Public API
-    def dependencies(options = {})
-      header["requires"] = [header["requires"] || []].flatten
-      header["requires"].map! {|r| r.gsub(/^\//, "") }
+    def header=(new_header)
+      @header = new_header
+      # prepare defaults
+      @header["description"] ||= ""
+      @header["requires"] = [@header["requires"] || []].flatten
+      @header["requires"].map! {|r| r.gsub(/^(\.)?\//, "") }
+      @header["provides"] = [@header["provides"] || []].flatten
+    end
+
+    def header
+      self.header = {} unless @header
+      @header
+    end
+
+    def dependencies(options = {})            
       if !options[:short] && package
         header["requires"].map {|r| r.index("/") ? r : "#{package.name}/#{r}"}
       else
@@ -46,8 +57,15 @@ module Jsus
     end
     alias_method :requires, :dependencies
 
-    def provides(options = {})
-      header["provides"] = [header["provides"] || []].flatten
+    def external_dependencies
+      dependencies(:short => true).select {|d| d.index("/") }
+    end
+
+    def internal_dependencies
+      dependencies(:short => true) - external_dependencies
+    end
+
+    def provides(options = {})      
       if !options[:short] && package
         header["provides"].map {|p| "#{package.name}/#{p}"}
       else
@@ -56,7 +74,7 @@ module Jsus
     end
 
     def description
-      header["description"] ||= ""
+      header["description"]
     end
 
     def to_hash

data/spec/lib/jsus/package_spec.rb

@@ -123,8 +123,8 @@ describe Jsus::Package do
 
     it "should include external dependencies into self" do
       subject.include_dependencies!
-      subject.should have(3).external_dependencies
-      compiled = subject.compile
+      subject.should have(3).linked_external_dependencies
+      compiled = subject.compile(output_dir)
       ["Class", "Hash", "Mash"].each do |name|
         compiled.should include(IO.read("#{lib_dir}/#{name}/Source/#{name}.js"))
       end

data/spec/lib/jsus/source_file_spec.rb

@@ -34,13 +34,16 @@ describe Jsus::SourceFile do
     end
 
     it "should set all available fields from constructor" do
-      source = Jsus::SourceFile.new(:package => 1, :content => 2, :filename => 3,
-                                    :relative_filename => 4, :header => 5)
-      source.package.should == 1
-      source.content.should == 2
-      source.filename.should == 3
-      source.relative_filename.should == 4
-      source.header.should == 5
+      source = Jsus::SourceFile.new(:package           => package,
+                                    :content           => subject.content,
+                                    :filename          => subject.filename,
+                                    :relative_filename => subject.relative_filename,
+                                    :header            => subject.header)
+      source.package.should           == package
+      source.content.should           == subject.content
+      source.filename.should          == subject.filename
+      source.relative_filename.should == subject.relative_filename
+      source.header.should            == subject.header
     end
 
     it "should register package in pool from constructor" do
@@ -61,7 +64,7 @@ describe Jsus::SourceFile do
     end
 
     it "should work well when given single string instead of array" do
-      subject.header["provides"] = "Mash"
+      subject.header = {"provides" => "Mash"}
       subject.provides.should == ["Core/Mash"]
     end
   end
@@ -76,17 +79,17 @@ describe Jsus::SourceFile do
     end
 
     it "should work well when given single string instead of array" do
-      subject.header["requires"] = "Class"
+      subject.header = { "requires" => "Class" }
       subject.dependencies.should == ["Core/Class"]
     end
 
     it "should not truncate package name in short form for external dependencies" do
-      subject.header["requires"] = "Mash/Mash"
+      subject.header = { "requires" => "Mash/Mash" }
       subject.dependencies(:short => true).should == ["Mash/Mash"]
     end
 
     it "should not prepend package name in full form for external dependencies" do
-      subject.header["requires"] = "Mash/Mash"
+      subject.header = { "requires" => "Mash/Mash" }
       subject.dependencies.should == ["Mash/Mash"]
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Markiz, idea by Inviz (http://github.com/Inviz)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +04:00
+date: 2010-06-07 00:00:00 +04:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: optiflag
+  name: choice
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -104,7 +104,6 @@ files:
 - Rakefile
 - TODO
 - bin/jsus
-- jsus.gemspec
 - lib/jsus.rb
 - lib/jsus/container.rb
 - lib/jsus/package.rb
@@ -148,6 +147,7 @@ files:
 - spec/shared/class_stubs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- jsus.gemspec
 has_rdoc: true
 homepage: http://github.com/markiz/jsus
 licenses: []