pattern 0.9.1 → 0.9.2

data/DOCS/todolist.txt

@@ -7,4 +7,11 @@
 4. 支持建立文件夹              X
 5. 支持默认模式               OK
 6. 支持添加template目录    
-7. 
+ 6.1. config类来处理
+ 6.2. 添加一个
+ 6.3. 删除一个
+7. 添加新的templates
+8. 列出可用的template
+9. help功能
+
+发现一个问题，如果我的问题不能按我的想法来排列，我先做下面的，再做上面的，我会很不舒服 

data/bin/pattern

@@ -1,12 +1,19 @@
 #!/usr/bin/env ruby
-
 current_dir = File.dirname(__FILE__)
 
-require current_dir + '/../lib/version'
 if %w(--version -v).include? ARGV.first
+  require current_dir + '/../lib/version'
   puts "pattern #{Pattern::VERSION::STRING}"
   exit(0)
 end
+
+if %w(--set -s).include? ARGV.first
+  require current_dir + '/../lib/configuration'
+  configuration = Configuration.new
+  configuration.execute(ARGV)
+  exit(0)
+end
+
 require current_dir + '/../lib/compositecode'
 pattern = CompositeCode.new(Command.new(ARGV))
 pattern.execute

data/etc/templates_path.conf

@@ -1,2 +1,2 @@
 ../templates
-E:/dev/easypattern/templates2
+E:/dev/pattern/templates2

data/lib/configuration.rb

@@ -0,0 +1,44 @@
+# config templates_path
+
+require 'pathname'
+
+class Configuration
+  def initialize
+  	@config_file = "#{File.dirname(__FILE__)}/../etc/templates_path.conf"
+  end
+  def get_path
+  	File.open(@config_file).readlines.collect do |path|
+  	  path = absolute_path(path.chomp,File.dirname(__FILE__))
+  	end
+  end
+  def add_path(path)
+  	File.open(@config_file,"a") do |file|
+  	  path.each do |p|
+  	  	file.puts absolute_path(p)
+  	  end
+  	end
+  end
+  def remove_path(path)
+  	path_set = get_path - path.collect { |p| p= absolute_path(p) }
+    File.open(@config_file,"w") do |file|
+      path_set.each do |p|
+      	file.puts p
+      end
+    end	
+  end
+  def execute(argv)
+  	parameters = argv[2..100] || [Dir.pwd]   	
+  	action = argv[1]
+  	add_path(parameters) if action=="add"
+  	remove_path(parameters) if action == "remove"
+  	get_default if action == "default"
+  end
+  def get_default
+  	File.open(@config_file,"w") do |file|
+  	  file.puts "../templates"
+  	end
+  end
+  def absolute_path(path,dir=Dir.pwd)
+  	Pathname.new(path).relative? ? File.expand_path(path,dir) : path
+  end
+end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Pattern
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/pattern.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
 #  Package information
 #-----------------------------
 	spec.name = 'pattern'
-	spec.version = '0.9.1'
+	spec.version = '0.9.2'
 	spec.executables << 'pattern'
 	spec.has_rdoc = true
 	spec.rdoc_options << '--title' << 'Pattern' <<

data/test/command_spec.rb

@@ -9,19 +9,18 @@ describe Command do
   	@command.get_template_dir_from_params.should == "ruby.composite"
   end
   it "2. get_templates_dirs should return ['../templates','../templates2']" do
-  	@command.get_templates_dirs(@command.get_template_dir_from_params).should == 
-  	                    ['E:/dev/easypattern/templates/ruby.composite',
-  	                    'E:/dev/easypattern/templates2/ruby.composite']
+  	@command.get_templates_dirs(@command.get_template_dir_from_params)[0].should == 
+  	                                      'E:/dev/pattern/templates/ruby.composite'
   end
   it "3. Command.new should get right parameter form param" do
-  	@command.template_dir.should == "E:/dev/easypattern/templates/ruby.composite"
+  	@command.template_dir.should == "E:/dev/pattern/templates/ruby.composite"
   	@command.classes.should == [["Task"],["compositeTask"],
   	                                ["AddDryIngredientsTask","MixTask"],["MakeBatterTask"]]
   	@command.operations.should == [['execute']]  
-  	@command.target_dir.should == "E:/dev/easypattern"	
+  	@command.target_dir.should == "E:/dev/pattern"	
   end
   it "4. absolute_path should return absolute path " do
-  	@command.absolute_path("../templates/ruby.composite","./bin/../lib").should == "E:/dev/easypattern/templates/ruby.composite"
+  	@command.absolute_path("../templates/ruby.composite","./bin/../lib").should == "E:/dev/pattern/templates/ruby.composite"
   end
 end
 

data/test/compositecode_spec.rb

@@ -2,49 +2,49 @@ require File.dirname(__FILE__) + '/../lib/compositecode'
 
 describe CompositeCode do
   before(:each) do
-  	params = "-t ruby.composite -d E:/dev/easypattern/target -c Task;CompositeTask;AddDryIngredientsTask,MixTask;MakeBatterTask -op execute,test".split(" ")
+  	params = "-t ruby.composite -d E:/dev/pattern/target -c Task;CompositeTask;AddDryIngredientsTask,MixTask;MakeBatterTask -op execute,test".split(" ")
   	@command = Command.new(params)
-  	@target_dir = "E:/dev/easypattern/target"
+  	@target_dir = "E:/dev/pattern/target"
   	@compositecode = CompositeCode.new(@command)
   end
   it "1. classes_to_codes should return codes " do
   	@compositecode.load_readme
   	@compositecode.classes_to_codes.length.should == 5
   	code = @compositecode.codes[0]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/component.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/task.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/component.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/task.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[1]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/composite.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/compositetask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/composite.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/compositetask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[2]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/leaf.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/adddryingredientstask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/leaf.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/adddryingredientstask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[3]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/leaf.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/mixtask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/leaf.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/mixtask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"MixTask",
   	                                "composite_object_name"=>"MakeBatterTask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[4]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/compositeobject.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/makebattertask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/compositeobject.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/makebattertask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
@@ -52,37 +52,37 @@ describe CompositeCode do
                                    }            
   end
   it "2. default params should return base_name and default_classes " do
-  	params = "ruby.composite Task -d E:/dev/easypattern/target".split(" ")
+  	params = "ruby.composite Task -d E:/dev/pattern/target".split(" ")
   	@compositecode = CompositeCode.new(Command.new(params))
   	@compositecode.load_readme
   	@compositecode.classes_to_codes.length.should == 4
   	code = @compositecode.codes[0]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/component.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/task.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/component.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/task.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[1]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/composite.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/compositetask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/composite.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/compositetask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[2]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/leaf.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/leaftask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/leaf.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/leaftask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[3]
-  	code.template_file_name.should == "E:/dev/easypattern/templates/ruby.composite/compositeobject.rb"
-  	code.target_file_name.should == "E:/dev/easypattern/target/compositeobjecttask.rb"
+  	code.template_file_name.should == "E:/dev/pattern/templates/ruby.composite/compositeobject.rb"
+  	code.target_file_name.should == "E:/dev/pattern/target/compositeobjecttask.rb"
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",

data/test/configuration_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../lib/configuration'
+
+describe Configuration do
+  before(:each) do
+  	@configuration = Configuration.new
+  	@configuration.get_default
+  end
+  after(:each) do
+  	@configuration.get_default
+  end
+  it "1. get_path should return current path " do
+  	@configuration.get_path[0].should == "E:/dev/pattern/templates"
+  	@configuration.get_path.length == 1
+  end
+  it "2. add_path should add a path into configuration" do
+  	@configuration.add_path(["E:/dev/pattern/templates2","E:/dev/pattern/templates3"])
+  	@configuration.get_path[0].should == "E:/dev/pattern/templates"
+  	@configuration.get_path[1].should == "E:/dev/pattern/templates2"
+  	@configuration.get_path[2].should == "E:/dev/pattern/templates3"
+  	@configuration.get_path.length == 3
+  end
+  it "3. remove_path should remove a path form configuration" do
+  	@configuration.add_path(["E:/dev/pattern/templates2","E:/dev/pattern/templates3"])
+  	@configuration.remove_path(["E:/dev/pattern/templates2"])
+  	@configuration.get_path[1].should == "E:/dev/pattern/templates3"
+  	@configuration.get_path.length == 2
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pattern
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - weizhao
@@ -31,11 +31,14 @@ files:
 - lib/code.rb
 - lib/command.rb
 - lib/compositecode.rb
+- lib/configuration.rb
 - lib/patterncode.rb
 - lib/version.rb
 - bin/pattern
 - LICENSE
 - pattern-0.9.0.gem
+- pattern-0.9.1.gem
+- pattern-0.9.2.gem
 - pattern.gemspec
 - Rakefile
 - README
@@ -43,6 +46,7 @@ files:
 - test/code_spec.rb
 - test/command_spec.rb
 - test/compositecode_spec.rb
+- test/configuration_spec.rb
 - test/patterncode_spec.rb
 - templates/ruby.composite/component.rb
 - templates/ruby.composite/composite.rb
@@ -92,4 +96,5 @@ test_files:
 - test/code_spec.rb
 - test/command_spec.rb
 - test/compositecode_spec.rb
+- test/configuration_spec.rb
 - test/patterncode_spec.rb