logirel 0.0.6 → 0.0.8

data/.semver

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 6
+:patch: 8
 :special: ""

data/README.md

@@ -1,5 +1,19 @@
 Let's try and make a gem to create .Net projects easily.
 
+Getting started
+===============
+ 1. `gem install logirel`
+ 1. Go to the project of your choice
+ 1. `logirel init`
+ 1. You should now answer the questions that logirel poses.
+
+ 
+Hacking it
+==========
+ 1. `git clone https://haf@github.com/haf/logirel.git`
+ 1. `bundle install`
+ 1. `bundle exec rspec spec`
+
 My thinking
 ===========
 
@@ -46,4 +60,7 @@ of managing another build is too large.
 
 Shoulders of Giants
 ===================
- * http://madduck.net/blog/2007.07.11:creating-a-git-branch-without-ancestry/
+ * http://madduck.net/blog/2007.07.11:creating-a-git-branch-without-ancestry/
+ * http://rubydoc.info/github/wycats/thor/master/file/README.md
+ * https://github.com/radar/guides/blob/master/gem-development.md
+ * http://eggsonbread.com/2010/03/28/my-rspec-best-practices-and-tips/

data/Rakefile.rb

@@ -1,5 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'; 
+RSpec::Core::RakeTask.new(:spec)
 # Requires Bundler and adds the 
 #build, install and release 
 #Rake tasks by way of calling Bundler::GemHelper.install_tasks. 

data/bin/logirel

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'logirel'
-Logirel::Application.start
+require 'logirel/cli'
+Logirel::CLI.start

data/content/environment.rb

@@ -0,0 +1,82 @@
+require 'semver'
+
+namespace :env do
+
+  task :common do
+
+    # version management
+    fv = version(VERSION_BASE)
+    build = ENV['BUILD_NUMBER'] || fv[2]
+    revision = ENV['OFFICIAL_RELEASE'] || (fv[3] == 0 ? Time.now.strftime('%j%H') : fv[3]) #  (day of year 0-265)(hour 00-24)
+    
+    real_version = [fv[0], fv[1], build, revision]
+    
+    ENV['VERSION'] = VERSION = real_version.join(".")
+    ENV['VERSION_INFORMAL'] = VERSION_INFORMAL = real_version.join(".")
+    puts "Assembly Version: #{VERSION}."
+    puts "##teamcity[buildNumber '#{VERSION}']" # print the version (revision) and build number to ci
+    
+    # configuration management
+    ENV['FRAMEWORK'] = FRAMEWORK = ENV['FRAMEWORK'] || (Rake::Win32::windows? ? "net40" : "mono28")
+    puts "Framework: #{FRAMEWORK}"
+  end
+  
+  # configure the output directories
+  task :configure, [:str] do |t, args|
+    ENV['CONFIGURATION'] = CONFIGURATION = args[:str]
+    Folders[:binaries] = File.join(Folders[:out], FRAMEWORK, args[:str].downcase)
+    CLEAN.include(File.join(Folders[:binaries], "*"))
+  end
+  
+  task :set_dirs do
+    Folders[:proj_out] = File.join(Folders[:src], Projects[:proj][:dir], 'bin', CONFIGURATION)
+    CLEAN.include(Folders[:proj_out])
+    
+    # for tests
+    Folders[:proj] = File.join(Folders[:src], Projects[:proj][:test_dir], 'bin', CONFIGURATION)
+    Files[:proj][:test] = File.join(Folders[:proj_test_out], "#{Projects[:proj][:test_dir]}.dll")
+    CLEAN.include(Folders[:proj_test_out])
+  end
+  
+  desc "set debug environment variables"
+  task :debug => [:common] do
+    Rake::Task["env:configure"].invoke('Debug')
+    Rake::Task["env:set_dirs"].invoke
+  end
+  
+  desc "set release environment variables"
+  task :release => [:common] do
+    Rake::Task["env:configure"].invoke('Release')
+    Rake::Task["env:set_dirs"].invoke
+  end
+  
+  desc "set GA envionment variables"
+  task :ga do
+    puts "##teamcity[progressMessage 'Setting environment variables for GA']"
+    ENV['OFFICIAL_RELEASE'] = OFFICIAL_RELEASE = "4000"
+  end
+  
+  desc "set release candidate environment variables"
+  task :rc, [:number] do |t, args|
+    puts "##teamcity[progressMessage 'Setting environment variables for Release Candidate']"
+    arg_num = args[:number].to_i
+    num = arg_num != 0 ? arg_num : 1
+    ENV['OFFICIAL_RELEASE'] = OFFICIAL_RELEASE = "#{3000 + num}"
+  end
+  
+  desc "set beta-environment variables"
+  task :beta, [:number] do |t, args|
+    puts "##teamcity[progressMessage 'Setting environment variables for Beta']"
+    arg_num = args[:number].to_i
+    num = arg_num != 0 ? arg_num : 1
+    ENV['OFFICIAL_RELEASE'] = OFFICIAL_RELEASE = "#{2000 + num}"
+  end
+  
+  desc "set alpha environment variables"
+  task :alpha, [:number] do |t, args|
+    puts "##teamcity[progressMessage 'Setting environment variables for Alpha']"
+    arg_num = args[:number].to_i
+	num = arg_num != 0 ? arg_num : 1
+    ENV['OFFICIAL_RELEASE'] = OFFICIAL_RELEASE = "#{1000 + num}"
+  end
+end

data/content/utils.rb

@@ -0,0 +1,30 @@
+require 'fileutils'
+
+def commit_data
+  begin  
+    commit = `git log -1 --pretty=format:%H`
+    git_date = `git log -1 --date=iso --pretty=format:%ad`
+    commit_date = DateTime.parse( git_date ).strftime("%Y-%m-%d %H%M%S")
+  rescue
+    commit = "git unavailable"
+    commit_date = Time.new.strftime("%Y-%m-%d %H%M%S")
+  end
+  [commit, commit_date]
+end
+
+
+def copy_files(from_dir, file_pattern, out_dir)
+	FileUtils.mkdir_p out_dir unless FileTest.exists?(out_dir)
+	Dir.glob(File.join(from_dir, file_pattern)){|file|
+		copy(file, out_dir) if File.file?(file)
+	}
+end
+
+def versions(str)
+  str.split(/\r\n|\n/).map{|s|version(s)}.compact.sort
+end
+
+def version(str)
+  ver = /v?(\d+)\.(\d+)\.(\d+)\.?(\d+)?/i.match(str).to_a()
+  ver[1,4].map{|s|s.to_i} unless ver == nil or ver.empty?
+end

data/lib/logirel/Initer.rb

@@ -1,19 +1,20 @@
-module Logirel
-  require 'semver'
+require 'semver'
+require 'enumerator'
+require 'net/http'
 
+module Logirel
   class Initer
-  
-	attr_accessor :root_path
 	
-	def initialize(root = '.')
-	  @root_path = root
-	end
+	attr_accessor :root_path, :buildscripts_path
+	
+	def initialize(root = '.', buildscripts = 'buildscripts'); 
+	                @root_path = root
+					@buildscripts_path = buildscripts; end
+	def set_root(root); @root_path = root; end
   
     def get_commands
 	  cmd ||= []
-	  cmd << "gem update"
-	  cmd << "bundle install"
-	  cmd << "bin\NuGet.exe update"
+	  cmd << "semver init"
 	end
 	
 	def nuget_from_codeplex(cp_ver, gem_ver)
@@ -28,6 +29,74 @@
 	  end
 	end
 	
+	def create_path_folders(metas, f)
+	  	f.puts %q{
+require File.dirname(__FILE__) + '/project_data'
+root_folder = File.expand_path("#{File.dirname(__FILE__)}/..")
+Folders = \{
+}
+		f.puts ":src => " + StrQ.new("src").exec + ","
+		f.puts ":out => " + StrQ.new("build").exec + ","
+		f.puts ":package => " + StrQ.new("packages").exec + ","
+		f.puts ":tools => " + StrQ.new("tools").exec + ","
+		f.puts %q{:tests => File.join("build", "tests"),
+:nuget => File.join("build", "nuget"),
+:root => root_folder,
+:binaries => "placeholder - specify build environment",
+}
+		f.puts ":#{metas[:ruby_key]}" + " => {"
+        f.puts ':nuspec => File.join("build", "nuspec", Projects[' + ":#{metas[:ruby_key]}" + '][' + ":#{metas[:dir]}" + ']),'
+        f.puts %q{:out => 'placeholder - specify build environment',
+:test_out => 'placeholder - specify build environment'
+\},\}}
+	end
+	
+	def create_path_files(metas, f)
+	    f.puts "Files = {"
+		f.puts ":sln => " + StrQ.new("sln").exec + ","
+		f.puts ":#{metas[:ruby_key]} => {"
+		f.puts ':nuspec => File.join(Folders[:nuspec], Projects[' + ":#{metas[:ruby_key]}" + '][' + ":#{metas[:id]}" + '].nuspec),'
+		f.puts %q{:nunit => File.join(Folders[:nunit], "nunit-console.exe"),
+:ilmerge => File.join(Folders[:tools], "ILMerge.exe")
+\},\}}
+	end
+	
+	def create_path_commands(metas, f)
+	  	f.puts %q{Commands = \{
+:nuget => File.join(Folders[:tools], "NuGet.exe")
+\}}
+	end
+	
+	def create_path_uris(metas, f)
+	  	f.puts %q{Uris = \{
+:nuget_offical => "http://packages.nuget.org/v1/"
+\}}
+	end
+	
+	def init_paths_rb(metas)
+      File.open(File.join(@root_path, @buildscripts_path, "paths.rb"), "w") do |f|
+        create_path_folders(metas, f)
+		create_path_files(metas, f)
+		create_path_commands(metas, f)
+		create_path_uris(metas, f)
+	  end
+	  # File.open(File.join(@root_path, @buildscripts_path, "paths.rb"), "r") do |infile|
+        # puts ""
+		# puts ""
+		# while (line = infile.gets)
+          # puts "#{line}"
+        # end
+	  # end
+	end
+	
+	def init_environement_rb
+	  path = File.join(@root_path, @buildscripts_path, "environment.rb")
+	  File.open(path, "w") do |f|
+	    f.puts Net::HTTP.get(
+		  URI.parse('https://raw.github.com/haf/logirel/master/content/environment.rb'))
+	  end
+	end
+	
 	def parse_folders
 	  src = File.join(@root_path, 'src', '*')
 	  Dir.
@@ -39,10 +108,75 @@
 		map{|x| File.basename(x) }
 	end
 	
-	def init_rakefile
-	  File.open(File.join(@root_path, "Rakefile.rb"), "w") do |f|
-	    f.puts "require 'bundler'"
+	def init_gemfile
+	  File.open(File.join(@root_path, "Gemfile"), "w") do |f|
+        f.puts 'source "http://rubygems.org"'
+        f.puts 'gem "albacore"'
+		f.puts 'gem "semver"'
+		f.puts 'gem "bundler"'
+	  end
+	end
+	
+	def init_utils
+	  path = File.join(@root_path, @buildscripts_path, "utils.rb")
+	  File.open(path, "w") do |f|
+	    f.puts Net::HTTP.get(
+		  URI.parse('https://raw.github.com/haf/logirel/master/content/utils.rb'))
 	  end
 	end
+	
+	def build_tasks(metas)
+	  
+	end
+	
+	def assembly_infos(metas)
+	  
+	end
+	# asm info for every nuget
+	def nugets(metas)
+	  
+	end
+	
+	def init_rakefile(metas)
+	  # puts metas.map{|m| ":build_"+m.ruby_key}
+      File.open(File.join(@root_path, @buildscripts_path, "Rakefile.rb"), "w") do |f|
+	    f.puts %q{
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+Bundler.require # if rake gets a wee bit too slow, you may remove this
+require 'albacore'
+require 'semver'
+require 'rake/clean'
+require '#{buildscripts_path}/project_details'
+require '#{buildscripts_path}/paths'
+require '#{buildscripts_path}/utils'
+require '#{buildscripts_path}/environment'
+task :default => [:release]
+task :debug => ["env:debug", :build]
+task :release => ["env:release", :build]
+task :ci => ["env:release", :build, :package]
+}
+        f.puts "task :build => #{metas[:ruby_key]}"
+		
+		f.puts build_tasks(metas)
+	  end
+	end
+	
+	def init_project_details(metadata)
+      File.open(File.join(@root_path, @buildscripts_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 "}"
+      end
+	end
   end
 end

data/lib/logirel/cli.rb

@@ -0,0 +1,77 @@
+require 'logirel/initer'
+require 'logirel/version'
+require 'logirel/q_model'
+require 'uuid'
+require 'thor'
+require 'FileUtils'
+
+module Logirel
+ class CLI < Thor
+    
+	desc "init", "Convert the current folder's projects (src) into a rake+albacore build"
+	def init(root_dir = Dir.pwd)
+      
+      puts "Logirel version #{Logirel::VERSION}"
+	  curr = Dir.pwd
+      
+      puts ""
+      puts "Directories Selection"
+      puts "---------------------"
+	  
+	  folder = lambda { |query, default|
+	    StrQ.new(query, default, STDIN, lambda { |dir| 
+		  true # perform validation here if you wish
+		}, STDOUT)
+	  }
+	  
+	  src_folders = Initer.new('./src').parse_folders.inspect
+      dir = folder.call("Source Directory. Default contains (#{src_folders})", "./src").exec
+      buildscripts = folder.call("Buildscripts Directory", "./buildscripts").exec
+	  tools = folder.call("Tools Directory", "./tools").exec
+	  initer = Initer.new(dir)
+	  initer.buildscripts_path = buildscripts
+	  
+      puts ""
+      puts "Project Selection"
+      puts "-----------------"
+      
+      selected_projs = initer.parse_folders.
+        find_all { |f| BoolQ.new(f).exec }
+
+	  puts "Selected: #{selected_projs.inspect}"
+	  
+      puts ""
+      puts "Project Meta-Data Definitions"
+      puts "-----------------------------"
+	  
+	  puts "initing semver in folder #{dir}"
+	  `semver init`
+      
+      metas = selected_projs.map do |p|
+        
+        base = File.basename(p)
+        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", "#{base} at commit #{`git log --pretty-format=%H`}").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
+      
+	  initer.init_project_details(metas)
+      initer.init_path_rb(metas)
+      initer.init_environement_rb
+	  initer.init_gemfile
+	  initer.init_utils
+      initer.init_rakefile(metas)
+    end
+  end
+end

data/lib/logirel/q_model.rb

@@ -1,43 +1,61 @@
 module Logirel
-  
   class Q
-    attr_accessor :question
+    attr_accessor :question, :default
   end
   
   class BoolQ < Q
     attr_accessor :pos_answer, :neg_answer
     
-    def initialize(question, name) 
+    def initialize(question, 
+	               default, 
+	               io_source = STDIN, 
+	               io_target = STDOUT)
       @question = question
-  	#@pos_answer lambda { name }
-  	#@neg_answer lambda { }
+	  @default = default
+	  @io_source = io_source
+	  @io_target = io_target
     end
+	
+	def default_str
+	  @default ? "[Yn]" : "[yN]"
+	end
     
-    def exec 
-      puts @question
-      #a = gets
-      #a == 'yes' ? q.pos_answer.call : a == '' ? q.neg_answer.call
+    def exec
+      @io_target.print @question + " " + default_str
+	  a = ""
+	  begin
+	    a = @io_source.gets.chomp
+	  end while !a.empty? && !['y', 'n'].include?(a.downcase)
+	  a.empty? ? @default : (a == 'y')	  
     end
   end
   
   class StrQ < Q
-    attr_accessor :answer, :default
-    
-    def initialize(question, default = '.') 
+    def initialize(question, 
+	               default = nil, 
+	               io_source = STDIN, 
+				   validator = nil,
+				   io_target = STDOUT)
       @question = question
-	  @default = default
+      @default = default    
+      @io_source = io_source
+      @validator = validator || lambda { |s| true }
+	  @io_target = io_target
+	  @answer = ""
     end
     
-    def exec 
-      puts @question
-  	  @answer = gets.chomp || @default
+    def answer
+      @answer.empty? ? @default : @answer
     end
-  end
-  
-  class Querier
-    def include_package_for(projects)
-      projects.
-  	  map{ |p| BoolQ.new("Would you like to include the '#{p}' project, dear Sir?", p) }
+    
+    def exec
+      @io_target.print @question + " [#{@default}]: "
+	  begin
+        @answer = @io_source.gets.chomp
+	  end while !@answer.empty? && !@validator.call(@answer)
+	  @answer = @answer.empty? ? @default : @answer
+	  @io_target.puts "Chose '#{@answer}'."
+	  @answer
     end
   end
 end

data/lib/logirel/querier.rb

@@ -0,0 +1,8 @@
+module Logirel
+  class Querier
+    def include_package_for(projects)
+      projects.
+  	  map{ |p| BoolQ.new("Would you like to include the '#{p}' project, dear Sir?", p) }
+    end
+  end
+end

data/lib/logirel.rb

@@ -6,92 +6,5 @@ require 'thor'
 require 'FileUtils'
 
 module Logirel
-  class Application < Thor
-    
-	desc "Convert projects to rake", "Convert the current folder's projects (src) into a rake+albacore build"
-	def convert
-      
-      puts "Logirel version #{Logirel::VERSION}"
-	  curr = Dir.pwd
-      
-      puts ""
-      puts "Directories Selection"
-      puts "---------------------"
-	  
-      dir = StrQ.new("Specify src directory (#{Initer.new('./src').parse_folders.inspect})", 
-	    "./src", 
-		lambda { |dir| !dir.empty? && Dir.exists?(dir) }).exec
-      
-      buildscripts = StrQ.new("Buildscripts Directory", "./buildscripts").exec
-	  tools = StrQ.new("Tools Directory", "./tools").exec
-	  
-	  puts "initing semver in folder above #{dir}"
-	  Dir.chdir File.join(dir, "..")
-	  sh "semver init" do |ok, err|
-	    ok || raise "failed to initialize semver"
-	  end
-	  Dir.chdir curr
-      
-      puts ""
-      puts "Project Selection"
-      puts "-----------------"
-      
-      selected_projs = Initer.new(dir).parse_folders.
-        map { |f| 
-          BoolQ.new(f, File.basename(f)).exec # TODO: return bool
-        }
-      
-      puts ""
-      puts "Project Meta-Data Definitions"
-      puts "-----------------------------"
-      
-      metas = selected_projs.map do |p|
-        
-        base = File.basename(p)
-        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", "#{base} at commit #{`git log --pretty-format=%H`}").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
-      
-      # TODO: test whether buildscripts/project_details.rb exists
-      details_path = File.join(buildscripts, "project_details.rb")
-      File.new(details_path, "w") do |f|
-        f.puts %q{ 
-  Projects = \{
-      }
-      end
-      
-      metas.each do |m|
-        File.open(details_path, "w") do |f|
-          k = m.ruby_key
-      	m.remove('ruby_key')
-          f.puts ":#{m.ruby_key} = #{p(m)}"
-      	f.puts ","
-        end 
-      end
-      
-      File.open(details_path, "w") do |f|
-          f.puts %q{ 
-        \}
-      }
-      end
-      
-      # TODO: paths
-  	
-      # TODO: Create rakefile!
-      
-      # TODO: tasks in rakefile.rb
-    end
-  end
+  # code here if you want
 end

data/spec/filesystem/filestructure_spec.rb

@@ -0,0 +1,56 @@
+require 'logirel/initer'
+require 'logirel/version'
+require 'logirel/nuget'
+require 'logirel/initer'
+require 'construct'
+require 'FileUtils'
+require File.dirname(__FILE__) + '/../support/with_sample_projects'
+include Logirel
+
+describe Initer, "setting up folder structure" do
+  
+  before(:each) do
+    @tmp = "fs-" + rand().to_s
+	@tmp_bs = "buildscripts"
+	Dir.mkdir(@tmp)	
+	@r = Initer.new(@tmp, @tmp_bs)
+	@r.create_structure
+	@bs = File.join(@r.root_path, @r.buildscripts_path)
+  end
+  
+  subject { @r }
+  
+  after(:each) do
+	FileUtils.rm_rf(@tmp) while Dir.exists?(@tmp)
+  end
+  
+  it { should respond_to :root_path }
+  
+  context "when we have an existing project" do
+    before {
+	  abc_projects(@r.root_path)
+	}
+	it "initer should correctly parse the names of existing projects" do
+      @r.parse_folders.should =~ ['A', 'C']
+    end
+  end
+  
+  it "should create the correct folder structure" do
+	@r.create_structure
+	Dir.exists?(@bs).should be_true
+	Dir.exists?(File.join(@tmp, "src")).should be_true
+  end
+  
+  it "should create environment.rb" do
+    @r.init_environement_rb
+	File.exists?(File.join(@bs, "environment.rb")).should be_true
+  end
+  
+  it "should create project_details.rb" do
+	@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/filesystem/path_init_spec.rb

@@ -0,0 +1,35 @@
+# require 'logirel/initer'
+# require 'logirel/version'
+# require 'logirel/nuget'
+# require 'logirel/initer'
+# require 'construct'
+# require 'FileUtils'
+
+# describe Logirel::Initer, "when initilizing paths file" do
+  # pending "too much of an integration test now"
+  
+  # before(:each) do
+    # @tmp = "fs-" + rand().to_s
+	# @tmp_bs = "buildscripts"
+	# Dir.mkdir(@tmp)	
+	# @r = Logirel::Initer.new(@tmp, @tmp_bs)
+	# @r.create_structure
+	# @bs = File.join(@r.root_path, @r.buildscripts_path)
+  # end
+  
+  # subject { @r }
+  
+  # after(:each) do
+	# FileUtils.rm_rf(@tmp) while Dir.exists?(@tmp)
+  # end
+  
+  # it "should be created" do
+	# @r.init_paths_rb({
+        # :dir => "p_dir",
+		# :ruby_key => "p_ruby_key",
+		# :id => "p_id"
+	  # })
+	# File.exists?(File.join(@bs, "paths.rb")).should be_true
+  # end
+  
+# end 

data/spec/filesystem/rakefile_init_spec.rb

@@ -0,0 +1,32 @@
+require 'logirel/initer'
+require 'logirel/version'
+require 'logirel/nuget'
+require 'logirel/initer'
+require 'construct'
+require 'FileUtils'
+
+describe Logirel::Initer, "when initilizing rake file" do
+  
+  before(:each) do
+    @tmp = "fs-" + rand().to_s
+	@tmp_bs = "buildscripts"
+	Dir.mkdir(@tmp)	
+	@r = Logirel::Initer.new(@tmp, @tmp_bs)
+	@r.create_structure
+	@bs = File.join(@r.root_path, @r.buildscripts_path)
+  end
+  
+  subject { @r }
+  
+  after(:each) do
+	FileUtils.rm_rf(@tmp) while Dir.exists?(@tmp)
+  end
+
+  it "should be created" do
+	@r.init_rakefile({
+	    :ruby_key => "p_ruby_key", 
+		:test2 => "p_test2"
+	  })
+	File.exists?(File.join(@bs, "Rakefile.rb")).should be_true
+  end
+end

data/spec/helpers.rb

@@ -0,0 +1,5 @@
+require 'rspec'
+
+RSpec.configure do |c|
+  c.mock_with :rspec
+end

data/spec/initer_spec.rb

@@ -0,0 +1,29 @@
+require 'logirel/initer'
+require 'logirel/version'
+require 'logirel/nuget'
+require 'logirel/initer'
+require 'construct'
+require 'FileUtils'
+
+describe Logirel::Initer, "when starting a new project" do
+
+  before(:each) do
+    include Construct::Helpers
+    @i = Logirel::Initer.new
+  end
+  
+  after(:each) do
+    Construct.destroy_all!
+  end
+  
+  it "should run the right commands" do
+    cmds = @i.get_commands
+	cmds.include?("semver init").should be_true
+  end
+  
+  it "should be able to know when to download from codeplex" do
+    @i.nuget_from_codeplex([1,3], [1,1]).should == true
+	@i.nuget_from_codeplex([1,3], [1,4]).should == false
+  end
+  
+end

data/spec/queries/bool_query_spec.rb

@@ -0,0 +1,30 @@
+require 'logirel/q_model'
+describe Logirel::BoolQ, "when given input" do
+  before(:each) { @out = StringIO.new }
+
+  it "input says no, second time" do
+    io = StringIO.new "x\nn"
+    b = BoolQ.new "Yes or no?", true, io, @out
+	b.exec.should be_false
+  end
+  it "input says yet, second time" do
+    io = StringIO.new "x\ny"
+    b = BoolQ.new "Yes or no?", false, io, @out
+	b.exec.should be_true
+  end
+  it "input says yes" do 
+    io = StringIO.new "y"
+    b = BoolQ.new "Yes or no?", false, io, @out
+	b.exec.should be_true
+  end
+  it "input says no" do
+    io = StringIO.new "n"
+    b = BoolQ.new("Yes or no?", true, io, @out)
+	b.exec.should be_false
+  end
+  it "input is default" do
+    io = StringIO.new "\n"
+    b = BoolQ.new("Yes or no?", true, io, @out)
+	b.exec.should be_true
+  end
+end

data/spec/{query_spec.rb → queries/querier_spec.rb}

@@ -1,5 +1,5 @@
-require 'logirel/q_model'
-require File.dirname(__FILE__) + '/with_sample_projects'
+require 'logirel/querier'
+require File.dirname(__FILE__) + '/../support/with_sample_projects'
 
 describe Logirel::Querier, "when getting available directories and having querier return the correct data structures" do
   
@@ -23,8 +23,10 @@ describe Logirel::Querier, "when getting available directories and having querie
   
   it "should not create a query for those project folders without *proj files" do
     with_sample_projects do |construct|
+	  # given
 	  r = Logirel::Initer.new(construct)
 	  folders = r.parse_folders
+	  # then
 	  @q.include_package_for(folders).map{|q| q.question }.
 	    each{ |str| str.include?("'B'").should be_false }      
 	end
@@ -32,8 +34,10 @@ describe Logirel::Querier, "when getting available directories and having querie
   
   it "should return two strings when two questions are asked" do 
     with_sample_projects do |construct|
+	  # given
 	  r = Logirel::Initer.new(construct)
 	  folders = r.parse_folders
+	  # then
 	  qs = @q.include_package_for(folders)
 	  qs.length.should eq(2)
 	end

data/spec/queries/string_query_spec.rb

@@ -0,0 +1,58 @@
+require 'logirel/q_model'
+
+describe Logirel::StrQ, "in its default mode of operation, when reading props" do
+  before(:each) { @q = StrQ.new "Q??", "def" }
+  subject { @q }
+  it { should respond_to :question }
+  it { should respond_to :default }
+  specify { @q.answer.should eql("def") }
+  specify { @q.question.should eql("Q??") }
+end
+
+describe Logirel::StrQ, "when feeding it OK input" do
+  before(:each) do 
+    @io = StringIO.new "My Answer"
+    @out = StringIO.new
+    @validator = double('validator')
+    @validator.should_receive(:call).once.
+      with(an_instance_of(String)).
+      and_return(true)
+  end
+  subject { StrQ.new("q?", "def", @io, @validator, @out) }
+  specify { 
+    subject.exec.should eql("My Answer") and 
+    subject.answer.should eql("My Answer") 
+  }
+end
+
+describe Logirel::StrQ, "when feeding it bad input" do
+  before(:each) do 
+    @io = StringIO.new "My Bad Answer\nAnother Bad Answer\nOKAnswer!"
+    @out = StringIO.new
+	
+    @validator = double('validator')
+    @validator.should_receive(:call).exactly(3).times.
+      with(an_instance_of(String)).
+      and_return(false, false, true)
+  end
+  subject { StrQ.new("q?", "def", @io, @validator, @out) }
+  specify { subject.exec.should == "OKAnswer!" }
+end
+
+describe Logirel::StrQ, "when accepting the defaults" do
+  before(:each) do 
+    @io = StringIO.new "\n"
+    @out = StringIO.new
+	
+    @validator = double('validator')
+    @validator.should_receive(:call).never.
+      with(an_instance_of(String)).
+	# the validator should never be called for empty input if we have a default
+      and_return(false)
+  end
+  subject { StrQ.new("q?", "def", @io, @validator, @out) }
+  specify {
+    subject.exec.should eql("def") and 
+    subject.answer.should eql("def") 
+  }
+end

data/spec/support/with_sample_projects.rb

@@ -0,0 +1,29 @@
+require 'construct'
+
+def with_sample_projects(&block)
+  Construct::within_construct do |c|	
+    # given files	
+    c.directory('src/A')
+    c.directory('src/B')
+    c.directory('src/C')
+    c.file('src/A/A.csproj') do |f|
+      f.puts "cs proj file ... xml in here"
+    end
+    
+    c.file('src/C/HelloWorld.vbproj')
+	block.call(c)
+  end
+end
+
+def abc_projects(in_folder)
+  #puts "creating projects A, B and C in #{in_folder}"
+  Dir.mkdir(File.join(in_folder, 'src/A'))
+  File.open(File.join(in_folder, 'src/A/A.csproj'), "w") do |f|
+    f.puts "cs proj file ... xml in here"
+  end
+  Dir.mkdir(File.join(in_folder, 'src/B'))
+  Dir.mkdir(File.join(in_folder, 'src/C'))
+  File.open(File.join(in_folder, 'src/C/HelloWorld.vbproj'), "w") do |f|
+    f.puts "vb-things"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logirel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-14 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25700928 !ruby/object:Gem::Requirement
+  requirement: &19696860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *25700928
+  version_requirements: *19696860
 - !ruby/object:Gem::Dependency
   name: memoize
-  requirement: &25700520 !ruby/object:Gem::Requirement
+  requirement: &19696584 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25700520
+  version_requirements: *19696584
 - !ruby/object:Gem::Dependency
   name: devver-construct
-  requirement: &25700052 !ruby/object:Gem::Requirement
+  requirement: &19696224 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25700052
+  version_requirements: *19696224
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &25699392 !ruby/object:Gem::Requirement
+  requirement: &19695828 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *25699392
+  version_requirements: *19695828
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &25698696 !ruby/object:Gem::Requirement
+  requirement: &19695396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *25698696
+  version_requirements: *19695396
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25698084 !ruby/object:Gem::Requirement
+  requirement: &19694976 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *25698084
+  version_requirements: *19694976
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &25697544 !ruby/object:Gem::Requirement
+  requirement: &19694544 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25697544
+  version_requirements: *19694544
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &25696932 !ruby/object:Gem::Requirement
+  requirement: &19694076 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25696932
+  version_requirements: *19694076
 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
@@ -107,7 +106,6 @@ description: ! "The gem works by having as its dependencies \n  everything you n
 email:
 - henrik@haf.se
 executables:
-- NuGet.exe
 - logirel
 extensions: []
 extra_rdoc_files: []
@@ -117,25 +115,30 @@ files:
 - Gemfile
 - README.md
 - Rakefile.rb
-- TODO.txt
-- bin/NuGet.exe
 - bin/logirel
+- content/environment.rb
+- content/utils.rb
 - lib/logirel.rb
 - lib/logirel/Initer.rb
 - lib/logirel/NuGet.rb
+- lib/logirel/cli.rb
 - lib/logirel/details_emitter.rb
 - lib/logirel/logirel.rb
 - lib/logirel/q_model.rb
+- lib/logirel/querier.rb
 - lib/logirel/version.rb
 - logirel.gemspec
-- spec/filestructure_spec.rb
-- spec/logirel_spec.rb
-- spec/nuget_spec.rb
-- spec/project_details_spec.rb
-- spec/query_spec.rb
-- spec/rakefile_init_spec.rb
+- spec/dependencies/nuget_spec.rb
+- spec/filesystem/filestructure_spec.rb
+- spec/filesystem/path_init_spec.rb
+- spec/filesystem/rakefile_init_spec.rb
+- spec/helpers.rb
+- spec/initer_spec.rb
+- spec/queries/bool_query_spec.rb
+- spec/queries/querier_spec.rb
+- spec/queries/string_query_spec.rb
+- spec/support/with_sample_projects.rb
 - spec/version_spec.rb
-- spec/with_sample_projects.rb
 - vendor/cache/albacore-0.2.5.gem
 - vendor/cache/devver-construct-1.1.0.gem
 - vendor/cache/diff-lcs-1.1.2.gem
@@ -149,7 +152,6 @@ files:
 - vendor/cache/semver-1.0.1.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/uuid-2.3.2.gem
-has_rdoc: true
 homepage: https://github.com/haf/logirel
 licenses: []
 post_install_message: 
@@ -173,7 +175,7 @@ requirements:
 - xbuild (on linux) or msbuild (on windows) for csproj files
 - Access to the internet w/o a proxy! ;)
 rubyforge_project: logirel
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Logirel's a best-shot for scaffolding versioning for a .Net solution.

data/TODO.txt

@@ -1,18 +0,0 @@
-q
-
-Path to search
-Ensure create_stucture
-For each item from path/src, ask if include
-For each sln in path/src, ask if setup msbuild task for it
-Create Rakefile.rb
- 
-For each include:
-  concatenate name => { props } to table
-  props := interactive questioning
-  include environment.rb file
-  include paths.rb file
-  include utils.rb in gem's code
-
-Gem stuff:
-
-* Ensude NuGet.exe is included and possible to call from the gem's code.

data/spec/filestructure_spec.rb

@@ -1,18 +0,0 @@
-require 'logirel/initer'
-require 'logirel/version'
-require 'logirel/nuget'
-require 'logirel/initer'
-require 'construct'
-require 'FileUtils'
-
-describe Logirel::Initer, "when reflecting upon previous project strucure" do
-  it "should correctly parse the names of existing projects" do
-    
-	with_sample_projects do |c|
-	  r = Logirel::Initer.new(c)
-	
-	  # initer should parse names:
-	  r.parse_folders.should =~ ['A', 'C']
-	end
-  end
-end

data/spec/logirel_spec.rb

@@ -1,46 +0,0 @@
-require 'logirel/initer'
-require 'logirel/version'
-require 'logirel/nuget'
-require 'logirel/initer'
-require 'construct'
-require 'FileUtils'
-
-describe Logirel::Initer, "when starting a new project" do
-
-  before(:each) do
-    include Construct::Helpers
-    @i = Logirel::Initer.new
-  end
-  
-  after(:each) do
-    Construct.destroy_all!
-  end
-  
-  it "should start by performing an upgrade" do
-    @i.get_commands[0].should eql("gem update")
-  end
-  
-  it "should then proceed running bundle install" do
-    @i.get_commands[1].should eql("bundle install")
-  end
-  
-  it "should then update nuget" do
-    @i.get_commands[2].include?('update').should == true
-  end
- 
-  it "should be able to know when to download from codeplex" do
-    @i.nuget_from_codeplex([1,3], [1,1]).should == true
-	@i.nuget_from_codeplex([1,3], [1,4]).should == false
-  end
-
-  it "should create the correct folder structure" do
-    Construct::within_construct do |c|
-	  r = Logirel::Initer.new(c)
-	  Dir.exists?(c+'buildscripts').should == false
-	  r.create_structure
-	  Dir.exists?(c+'buildscripts').should == true
-	  Dir.exists?(c+'src').should == true
-	end
-  end
-  
-end

data/spec/project_details_spec.rb

@@ -1,21 +0,0 @@
-require 'logirel'
-require 'FileUtils'
-
-describe Logirel::Initer, "when initilizing project details" do 
-  
-  before(:each) do 
-    @temp = "buildscripts"
-	Dir.mkdir(@temp) unless Dir.exists?(@temp)
-	@r = Logirel::Initer.new(@temp)
-  end
-  
-  after(:each) do
-    FileUtils.rm_rf(@temp) if Dir.exists?(@temp)
-  end
-  
-  it "should create project_details.rb" do
-    pending("need impl")
-    File.exitist?(File.join(@temp, "project_details.rb")).should be_true
-  end
-  
-end

data/spec/rakefile_init_spec.rb

@@ -1,26 +0,0 @@
-require 'logirel/initer'
-require 'logirel/version'
-require 'logirel/nuget'
-require 'logirel/initer'
-require 'construct'
-require 'FileUtils'
-
-describe Logirel::Initer, "when initilizing rake file" do
-  
-  attr_accessor :tmp, :r
-
-  before(:each) do
-    @tmp = "test-temp"
-	Dir.mkdir(@tmp) unless Dir.exists?(@tmp)	
-	@r = Logirel::Initer.new(@tmp)
-  end
-  
-  after(:each) do
-	FileUtils.rm_rf(@tmp) if Dir.exists?(@tmp)
-  end
-
-  it "should be created" do
-	@r.init_rakefile
-	File.exists?(File.join(@tmp, 'Rakefile.rb')).should == true
-  end
-end

data/spec/with_sample_projects.rb

@@ -1,16 +0,0 @@
-require 'construct'
-
-def with_sample_projects(&block)
-  Construct::within_construct do |c|	
-    # given files	
-    c.directory('src/A')
-    c.directory('src/B')
-    c.directory('src/C')
-    c.file('src/A/A.csproj') do |f|
-      f.puts "cs proj file ... xml in here"
-    end
-    
-    c.file('src/C/HelloWorld.vbproj')
-	block.call(c)
-  end
-end