logirel 0.0.14 → 0.0.15

data/.semver

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 14
+:patch: 15
 :special: ""

data/Rakefile.rb

@@ -24,7 +24,7 @@ task :tag => :verify do
   Rake::Task["build"].invoke
   
   if `git tag`.split("\n").include?("#{v.to_s}")
-    raise "Version #{v.to_s} has already been released"
+    raise "Version #{v.to_s} has already been released! You cannot release it twice."
   end
   puts 'adding'
   `git add Rakefile.rb`
@@ -42,4 +42,11 @@ task :push => :verify do
   `git push --tags`
   puts 'pushing'
   `git push`
+end
+
+desc "run specs, tag, push and release (to rubygems)"
+task :all => [:verify] do
+  Rake::Task["spec"].invoke
+  Rake::Task["release"].invoke
+  Rake::Task["push"].invoke
 end

data/lib/logirel/Initer.rb

@@ -1,6 +1,9 @@
 require 'semver'
 require 'enumerator'
 require 'net/http'
+require 'logirel/q_model'
+require 'uuid'
+
 
 module Logirel
   class Initer
@@ -168,18 +171,12 @@ task :ci => ["env:release", :build, :package]
 	
     def init_project_details(metadata)
 	  base_path = ensure_path @buildscripts_path
+	  projects = {}
+	  metadata.each{|m|
+	    projects[:"#{m[:ruby_key]}"] = m #.select{|kv| :"#{kv[0]}" != :"ruby_key"}
+	  }
       File.open(File.join(base_path, "project_details.rb"), "w+") do |f|
-        f.puts "Projects = {"
-        # m = ["my key", value]
-        # projects[m[0]] = value
-        metadata.keys.each_with_index do |key, index|
-          if index == metadata.length-1
-              f.puts ":#{key} = #{p(metadata[key])}"
-          else 
-            f.puts ":#{key} = #{p(metadata[key])},"
-          end
-        end
-        f.puts "}"
+        f.puts "Projects = #{p(projects)}"
       end
     end
 	
@@ -188,5 +185,25 @@ task :ci => ["env:release", :build, :package]
       Dir.mkdir base_path unless Dir.exists? base_path
 	  base_path
 	end
+	
+	def meta_for p, dir
+        base = File.basename(p)
+        
+        puts "META DATA FOR: '#{base}'"
+        p_dir = File.join(dir, base)
+        
+        {
+          :title => StrQ.new("Title", base).exec,
+          :dir => p_dir,
+          :test_dir => StrQ.new("Test Directory", base + ".Tests").exec,
+          :description => StrQ.new("Description", "Missing description for #{base}").exec,
+          :copyright => StrQ.new("Copyright").exec,
+          :authors => StrQ.new("Authors").exec,
+          :company => StrQ.new("Company").exec,
+          :nuget_key => StrQ.new("NuGet key", base).exec,
+          :ruby_key => StrQ.new("Ruby key (e.g. 'autotx')", nil, STDIN, lambda { |s| s != nil && s.length > 0 }).exec,
+          :guid => UUID.new.generate
+        }
+	end
   end
 end

data/lib/logirel/cli.rb

@@ -27,7 +27,7 @@ module Logirel
       }
       
       src_folders = Initer.new('.').parse_folders.inspect
-      dir = folder.call("Source Directory. Default contains (#{src_folders})", "src").exec
+      dir = folder.call("Source Directory. Default (src) contains (#{src_folders})", "src").exec
       buildscripts = folder.call("Buildscripts Directory", "buildscripts").exec
       tools = folder.call("Tools Directory", "tools").exec
       initer = Initer.new(".")
@@ -50,32 +50,24 @@ module Logirel
       puts "Project Meta-Data Definitions"
       puts "-----------------------------"
       puts "Let's set up some meta-data!"
-      metas = selected_projs.map do |p|
-        
-        base = File.basename(p)
-        
-        puts "META DATA FOR: '#{base}'"
-        p_dir = File.join(dir, base)
-        
-        {
-          :dir => p_dir,
-          :title => StrQ.new("Title", base).exec,
-          :test_dir => StrQ.new("Test Directory", base + ".Tests").exec,
-          :description => StrQ.new("Description", "of #{base}").exec,
-          :copyright => StrQ.new("Copyright").exec,
-          :authors => StrQ.new("Authors").exec,
-          :company => StrQ.new("Company").exec,
-          :nuget_key => StrQ.new("NuGet key", base).exec,
-          :ruby_key => StrQ.new("Ruby key (e.g. 'autotx')").exec,
-          :guid => UUID.new
-        }
-      end
+      metas = selected_projs.map{|p| initer.meta_for p, dir }
       
+	  puts "initing project details"
 	  initer.init_project_details(metas)
-      initer.init_path_rb(metas)
-      initer.init_environement_rb
+      
+	  puts "initing paths"
+	  initer.init_path_rb(metas)
+      
+	  puts "initing environment"
+	  initer.init_environement_rb
+	  
+	  puts "initing gemfile"
 	  initer.init_gemfile
+	  
+	  puts "initing utils"
 	  initer.init_utils
+	  
+	  puts "initing meta-datas"
       initer.init_rakefile(metas)
     end
   end

data/lib/logirel/q_model.rb

@@ -52,9 +52,11 @@ module Logirel
     
     def exec
       @io_target.print @question + " [#{@default}]: "
+	  valid = false
       begin
         @answer = @io_source.gets.chomp
-      end while !@answer.empty? && !@validator.call(@answer)
+		valid = @validator.call(@answer)
+      end while !valid || (!valid && @answer.empty?)
       @answer = @answer.empty? ? @default : @answer
       @io_target.puts "Chose '#{@answer}'."
       @answer

data/spec/filesystem/filestructure_spec.rb

@@ -47,10 +47,10 @@ describe Initer, "setting up folder structure" do
   end
   
   it "should create project_details.rb" do
-	@r.init_project_details({
+	@r.init_project_details([{
 	    :ruby_key => "p_ruby", 
 		:dir => "p_dir"
-	  })
+	  }])
 	File.exists?(File.join(@bs, "project_details.rb")).should be_true
   end
 end

data/spec/queries/string_query_spec.rb

@@ -45,10 +45,10 @@ describe Logirel::StrQ, "when accepting the defaults" do
     @out = StringIO.new
 	
     @validator = double('validator')
-    @validator.should_receive(:call).never.
+    @validator.should_receive(:call).once.
       with(an_instance_of(String)).
-	# the validator should never be called for empty input if we have a default
-      and_return(false)
+	# the validator should be called for empty input once if we have a default, directly when defaulting with validator{true}
+      and_return(true)
   end
   subject { StrQ.new("q?", "def", @io, @validator, @out) }
   specify {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logirel
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20363640 !ruby/object:Gem::Requirement
+  requirement: &20461944 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *20363640
+  version_requirements: *20461944
 - !ruby/object:Gem::Dependency
   name: memoize
-  requirement: &20363364 !ruby/object:Gem::Requirement
+  requirement: &20461668 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20363364
+  version_requirements: *20461668
 - !ruby/object:Gem::Dependency
   name: devver-construct
-  requirement: &20363052 !ruby/object:Gem::Requirement
+  requirement: &20461356 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20363052
+  version_requirements: *20461356
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &20362536 !ruby/object:Gem::Requirement
+  requirement: &20460840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *20362536
+  version_requirements: *20460840
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &20362056 !ruby/object:Gem::Requirement
+  requirement: &20460360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *20362056
+  version_requirements: *20460360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20361588 !ruby/object:Gem::Requirement
+  requirement: &20459892 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *20361588
+  version_requirements: *20459892
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &20361192 !ruby/object:Gem::Requirement
+  requirement: &20459496 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20361192
+  version_requirements: *20459496
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &20360760 !ruby/object:Gem::Requirement
+  requirement: &20459064 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20360760
+  version_requirements: *20459064
 description: ! "The gem works by having as its dependencies \n  everything you need
   to get started with OSS and proprietary .Net coding.\n  The aim of the gem is to
   allow developers to get up and running quickly\n  and provide a nice way of converting