yesman 0.0.4 → 0.0.5

data/bin/yesman

@@ -14,7 +14,7 @@ def new_project
   parser.run ARGV
   parser.config[:project_name] = project_name
 
-  y = Yesman.new parser.config
+  y = Yesman::Yesman.new parser.config
 end
 
 def run_project
@@ -40,7 +40,7 @@ def generate
   c = ConfigProxy.new
   if (c.config_exists?) 
     info = ARGV.shift
-    g = ClassGenerator.new
+    g = FileGenerator.new
     puts "Creating #{info}"
     g.create_class_files info
   else

data/lib/yesman.rb

@@ -3,6 +3,7 @@ require 'yesman/file_util'
 require 'yesman/gtest_installer'
 require 'yesman/logger'
 
+module Yesman
 class Yesman
   attr_reader :params
 
@@ -43,3 +44,4 @@ class Yesman
   end
 
 end
+end

data/lib/yesman/cpp_creator.rb

@@ -1,6 +1,6 @@
 require 'yesman/file_util'
 require 'yesman/logger'
-require 'yesman/class_generator'
+require 'yesman/file_generator'
 
 class CppCreator
   attr_reader :source
@@ -11,7 +11,7 @@ class CppCreator
 
   def initialize(params = {})
     set_defaults params
-    @gen = ClassGenerator.new
+    @gen = FileGenerator.new
     @log = Logger.new
   end
 
@@ -19,6 +19,7 @@ class CppCreator
     create_dirs
     create_source_main
     create_test_main
+    create_build_file
   end
 
 private 
@@ -46,4 +47,8 @@ private
   def create_test_main
     @gen.create_gtest_main
   end
+
+  def create_build_file
+    @gen.create_build_file
+  end
 end

data/lib/yesman/{class_generator.rb → file_generator.rb}

@@ -3,8 +3,9 @@ require 'yesman/templater'
 require 'yesman/file_util'
 require 'yesman/config_proxy'
 require 'yesman/logger'
+require 'yesman/rake_gen_data'
 
-class ClassGenerator
+class FileGenerator
 
   attr_reader :templates_path
   attr_reader :header_path
@@ -12,6 +13,7 @@ class ClassGenerator
   attr_reader :test_path
   attr_reader :main_path
   attr_reader :gtest_main_path
+  attr_reader :rake_file_path
 
   def initialize
     @templates_path = "#{Dir.home}/.yesman/templates/"
@@ -20,6 +22,7 @@ class ClassGenerator
     @test_path = create_path "test.cxx.erb"
     @main_path = create_path "main.cxx.erb"
     @gtest_main_path = create_path "gtest_main.cxx.erb"
+    @rake_file_path = create_path "rakefile.erb"
 
     @templater = Templater.new
     @log = Logger.new
@@ -52,6 +55,14 @@ class ClassGenerator
     @log.log_creation "created", file_path
   end
 
+  def create_build_file
+    rake_data = RakeGenData.new
+    file_contents = @templater.merge rake_data, rake_file_path
+    file_path = "Rakefile"
+    FileUtil.write_to_file file_path, file_contents
+    @log.log_creation "created", file_path
+  end
+
   private
 
 

data/lib/yesman/global_config.rb

@@ -1,3 +1,6 @@
+require 'yesman/version'
+require 'versionomy'
+
 class GlobalConfig
   attr_reader :pre_existing
   attr_reader :global_config_path
@@ -12,19 +15,34 @@ class GlobalConfig
 
     if !pre_existing
       puts "Copying file templates to #{global_config_path}" 
-      copy_templates
-      create_global_config
+      copy_all
+    elsif old_version?
+      FileUtil.clear_directory global_config_path
+      copy_all
     end
   end
 
   private
 
+  def copy_all
+    copy_templates
+    create_version_file
+    create_global_config
+  end
+
+
   def copy_templates
     FileUtil.ensure_path "#{global_config_path}/templates"
     templates = File.join(File.dirname(File.expand_path(__FILE__)), 'templates');
     FileUtil.recursive_copy(templates, global_config_path)
   end
 
+  def create_version_file
+    file_path = "#{global_config_path}/version"
+    FileUtil.ensure_file file_path
+    FileUtil.write_to_file file_path, Yesman::VERSION
+  end
+
   def create_global_config
     params = {};
     params[:source] = "src"
@@ -38,5 +56,22 @@ class GlobalConfig
   def ensure_config_dir
     @pre_existing = FileUtil.ensure_path global_config_path
   end
+
+  def old_version?
+    old = false;
+    version_path = "#{global_config_path}/version"
+    if !File.exists? version_path
+      old = true
+    else
+      sys_version = Versionomy.parse( File.read( version_path ).to_s )
+      current_version = Versionomy.parse ( Yesman::VERSION )
+      if sys_version < Yesman::VERSION
+
+        puts "Current global yesman version: #{sys_version}, re-writting globals"
+        old = true
+      end
+    end
+    old
+  end
   
 end

data/lib/yesman/rake_gen_data.rb

@@ -0,0 +1,27 @@
+require 'yesman/config_proxy'
+require 'erb'
+
+class RakeGenData
+
+  attr_reader :source_dir
+  attr_reader :test_dir
+  attr_reader :output_dir
+  attr_reader :project_name
+  attr_reader :extension
+
+  def initialize(args = {})
+    params = ConfigProxy.new.params
+    @source_dir = params[:source]
+    @test_dir = params[:tests]
+    @output_dir = params[:output]
+    @project_name = params[:project_name]
+    @extension = params[:extension]
+  end
+
+
+  def get_binding
+    binding
+  end
+
+
+end

data/lib/yesman/templates/rakefile.erb

@@ -0,0 +1,89 @@
+SRC = FileList['<%=source_dir %>/*.<%=extension%>']
+OBJ = SRC.ext('o');
+
+TESTS = FileList['<%=test_dir %>/*.<%=extension %>']
+TESTS.include('<%=source_dir %>/*.<%=extension%>')
+TESTS.exclude('<%=source_dir %>/<%=project_name%>.<%=extension%>')
+TOBJ = TESTS.ext('o')
+
+namespace "main" do
+
+  desc "Compile main application"
+  task :compile => [ "<%=output_dir%>/<%=source_dir%>", :reset, "main"]
+
+  task :show do |t|
+    OBJ.each { |o| puts o } 
+  end
+
+  task :reset do |t|
+    OBJ.gsub!(/<%=source_dir%>/, "<%=output_dir%>/<%=source_dir%>")
+  end
+
+  directory "<%=output_dir%>/<%=source_dir%>"
+
+  file "main" => OBJ do
+    sh "g++ -o <%=output_dir%>/main #{OBJ}"
+  end
+
+  desc "Run main application"
+  task :run do |t|
+    puts "Running source..."
+    sh "clear"
+    sh "./<%=output_dir%>/main"
+  end
+
+  desc "Build & Run main application"
+  task :build => [:compile]
+  task :build => [:run]
+  task :build
+
+end
+
+namespace "tests" do
+
+  desc "Compile all tests"
+  task :compile => [ "<%=output_dir %>/<%=test_dir%>", "<%= output_dir%>/<%=source_dir %>", :reset, "test_runner"]
+
+  task :show do |t|
+    TOBJ.each { |o| puts o } 
+  end
+
+  task :reset do |t|
+    TOBJ.gsub!(/<%=test_dir%>/, "<%=output_dir%>/<%=test_dir%>")
+    TOBJ.gsub!(/<%= source_dir %>/, "<%= output_dir %>/<%=source_dir%>")
+  end
+
+  directory "<%=output_dir%>/<%=test_dir%>"
+  directory "<%=output_dir%>/<%=source_dir%>"
+
+  file "test_runner" => TOBJ do
+    sh "g++ -o <%=output_dir%>/test_runner #{TOBJ} -I<%=test_dir%>/gtest/include <%=test_dir%>/gtest/libgtest.a"
+  end
+
+  desc "Run test suite"
+  task :run do |t|
+    puts "Running tests..."
+    sh "clear"
+    sh "./<%=output_dir%>/test_runner"
+  end
+
+  desc "Build & Run all tests"
+  task :build => [:compile]
+  task :build => [:run]
+  task :build
+
+  rule '.o' => '.<%=extension%>' do |t|
+    sh "g++ #{t.source} -c -o <%=output_dir%>/#{t.name} -I<%=test_dir%>/gtest/include"
+  end
+
+end
+
+rule '.o' => '.<%=extension%>' do |t|
+  sh "g++ #{t.source} -c -o <%=output_dir%>/#{t.name}"
+end
+
+# Insert your file dependencies here:
+# file 'FileName.o' =>[ 'FileName.c', 'Header.h', 'OtherHeader.h' ]
+# 
+# OR include them from another file like so:
+# import "your_file"

data/lib/yesman/version.rb

@@ -1,3 +1,3 @@
 module Yesman
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/yesman.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Yesman creates project directory structures, downloads and builds GTest for C++ development projects}
   gem.homepage      = ""
 
-  gem.add_dependency 'mixlib-cli'
-  gem.add_dependency 'paint'
+  gem.add_dependency 'mixlib-cli', '~> 1.2.2'
+  gem.add_dependency 'paint', '~> 0.8.5'
+  gem.add_dependency 'versionomy', '~> 0.4.4'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yesman
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 description: CLI for quick creation of C++ projects using GTest
 email:
 - knomedia@gmail.com
@@ -58,20 +74,22 @@ files:
 - Rakefile
 - bin/yesman
 - lib/yesman.rb
-- lib/yesman/class_generator.rb
 - lib/yesman/class_type.rb
 - lib/yesman/cli_parser.rb
 - lib/yesman/config_proxy.rb
 - lib/yesman/cpp_creator.rb
+- lib/yesman/file_generator.rb
 - lib/yesman/file_util.rb
 - lib/yesman/global_config.rb
 - lib/yesman/gtest_installer.rb
 - lib/yesman/logger.rb
+- lib/yesman/rake_gen_data.rb
 - lib/yesman/templater.rb
 - lib/yesman/templates/class.cxx.erb
 - lib/yesman/templates/gtest_main.cxx.erb
 - lib/yesman/templates/header.cxx.erb
 - lib/yesman/templates/main.cxx.erb
+- lib/yesman/templates/rakefile.erb
 - lib/yesman/templates/test.cxx.erb
 - lib/yesman/version.rb
 - spec/class_type_spec.rb