yesman 0.0.2 → 0.0.3

data/README.md

@@ -26,7 +26,7 @@ There are several optional parameters you can use that will adjust the following
 
 -o  Output Directory Name (defaults to "bin")
 
--x  C++ extension to use for generated files (defaults to "cpp")
+-e  C++ extension to use for generated files (defaults to "cpp")
 
 ## Requirements
 

data/bin/yesman

@@ -2,10 +2,11 @@
 
 require 'yesman'
 require 'yesman/cli_parser'
+require 'yesman/config_proxy'
+require 'yesman/global_config'
+require 'yesman/class_type'
+require 'yesman/templater'
 
-options = {}
-
-command = ARGV.shift
 
 def new_project
   project_name = ARGV.shift
@@ -13,11 +14,14 @@ def new_project
   parser.run ARGV
   parser.config[:project_name] = project_name
   puts "Generating new project: #{parser.config[:project_name]}"
+
   y = Yesman.new parser.config
 end
 
 def run_project
   flag = ARGV.shift
+  #cp = ConfigProxy.new
+  #puts cp.params
   if flag == '-d'
     debug_project
   else
@@ -33,17 +37,48 @@ def test_project
   puts "test not yet supported"
 end
 
+def generate
+  c = ConfigProxy.new
+  if (c.config_exists?) 
+    info = ARGV.shift
+    g = ClassGenerator.new
+    puts "Creating #{info}"
+    g.create_class_files info
+  else
+    puts "Da Da Dunn... you are not in a yesman project ABORTING..."
+  end
+end
+
+def init 
+  load_global_config
+  run_commands
+end
+
+def load_global_config
+  gc = GlobalConfig.new.load
+end
 
-case command
-when 'new'
-  new_project
-when 'run'
-  run_project
-when 'test'
-  test_project
-else
-  puts "command: #{command} not recognized"
+def run_commands
+  command = ARGV.shift
+  case command
+  when 'new'
+    new_project
+  when 'run'
+    run_project
+  when 'test'
+    test_project
+  when 'generate'
+    generate
+  when 'g'
+    generate
+  else
+    puts "command: #{command} not recognized"
+  end
 end
 
 
+init
+
+
+
 

data/lib/yesman/class_generator.rb

@@ -0,0 +1,80 @@
+require 'yesman/class_type'
+require 'yesman/templater'
+require 'yesman/file_util'
+require 'yesman/config_proxy'
+
+class ClassGenerator
+
+  attr_reader :templates_path
+  attr_reader :header_path
+  attr_reader :class_path
+  attr_reader :test_path
+  attr_reader :main_path
+  attr_reader :gtest_main_path
+
+  def initialize
+    @templates_path = "#{Dir.home}/.yesman/templates/"
+    @header_path = create_path "header.cxx.erb"
+    @class_path = create_path "class.cxx.erb"
+    @test_path = create_path "test.cxx.erb"
+    @main_path = create_path "main.cxx.erb"
+    @gtest_main_path = create_path "gtest_main.cxx.erb"
+
+    @templater = Templater.new
+  end
+  
+  def create_class_files input
+    c = create_class_type input
+    files = [header_path, class_path, test_path]
+    files.each do |path|
+      file_contents = @templater.merge c, path
+      FileUtil.write_to_file create_file_name( c, path ), file_contents
+    end
+
+  end
+
+  def create_main
+   c = create_class_type "Main"
+   output_file_path = "#{params[:source]}/#{params[:project_name]}.#{params[:extension]}"
+   FileUtil.write_to_file( output_file_path, ( @templater.merge c, main_path) )
+  end
+
+  def create_gtest_main
+    c = create_class_type "GTestMain"
+    file_contents = @templater.merge c, gtest_main_path
+    FileUtil.write_to_file "#{params[:tests]}/#{params[:project_name]}Tests.#{params[:extension]}", file_contents
+  end
+
+  private
+
+
+  def create_file_name class_type, path
+    file_name = ""
+    case path
+    when header_path
+      file_name << "#{params[:source]}/" << class_type.class_name << ".h"
+    when class_path
+      file_name << "#{params[:source]}/" << class_type.class_name << ".#{params[:extension]}"
+    when test_path
+      file_name << "#{params[:tests]}/" << class_type.class_name << "Test.#{params[:extension]}"
+    else
+      file_name << "undefined"
+    end
+    file_name
+  end
+
+  def create_class_type input
+    c = ClassType.new
+    c.parse_from_string input
+    c
+  end
+
+  def create_path filename
+    "#{templates_path}#{filename}"
+  end
+
+  def params
+    cp = ConfigProxy.new
+    cp.params
+  end
+end

data/lib/yesman/class_type.rb

@@ -0,0 +1,53 @@
+require 'erb'
+require 'yesman/config_proxy'
+
+class ClassType
+  attr_reader :class_name
+  attr_reader :namespace
+  attr_reader :super_class
+  attr_reader :source
+
+  def initialize
+    @class_name = nil
+    @namespace = nil
+    @super_class = nil
+    @source = ConfigProxy.new.params[:source]
+  end
+
+  def parse_from_string input
+    input = input.to_s
+    st = input.split("<")
+    st.each {|s| s.strip!}
+    
+    create_name_namespace st[0]
+    
+    if st[1] || st[1] != ""
+      create_super st[1]
+    else
+      @super_class = nil
+    end
+  end
+
+  def get_binding
+    binding
+  end
+
+  private
+
+  def create_name_namespace input
+    if input.index( "::" ) 
+      @namespace, @class_name = input.split "::"
+    else
+      @class_name = input
+    end
+  end
+
+  def create_super input
+   @super_class = nil
+    if input 
+      @super_class = ClassType.new
+      @super_class.parse_from_string input
+    end
+  end
+
+end

data/lib/yesman/config_proxy.rb

@@ -0,0 +1,42 @@
+require 'yaml'
+
+class ConfigProxy 
+  
+  attr_reader :params
+  attr_reader :config_path
+
+  def initialize
+    @params = nil
+    @config_path = ".yesman/config"
+  end
+
+  def create_config params
+    verify_config_exists
+    File.open( config_path, "w" ) do |file| 
+      file.write params.to_yaml
+    end
+    @params = params;
+  end
+
+  def load_config
+    verify_config_exists
+    @params = YAML::load_file config_path
+  end
+
+  def params 
+    if @params == nil
+      load_config
+    end
+    @params
+  end
+
+  def config_exists?
+    return File.exists? config_path
+  end
+
+  private
+  def verify_config_exists
+    FileUtil.ensure_file config_path
+  end
+  
+end

data/lib/yesman/cpp_creator.rb

@@ -1,4 +1,5 @@
 require 'yesman/file_util'
+require 'yesman/class_generator'
 
 class CppCreator
   attr_reader :source
@@ -9,6 +10,7 @@ class CppCreator
 
   def initialize(params = {})
     set_defaults params
+    @gen = ClassGenerator.new
   end
 
   def create_project
@@ -34,37 +36,10 @@ private
   end
 
   def create_source_main
-    filename = "#{source}/#{project_name}.#{extension}"
-    FileUtil.ensure_file filename
-    FileUtil.write_to_file filename, get_source_main
+    @gen.create_main    
   end
 
   def create_test_main
-    filename = "#{tests}/#{project_name}Tests.#{extension}"
-    FileUtil.ensure_file filename
-    FileUtil.write_to_file filename, get_test_main
-  end
-
-  def get_test_main
-    main = <<END
-#include "gtest/gtest.h"
-
-GTEST_API_ int main(int argc, char **argv) {
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-END
-  end
-
-  def get_source_main
-    main = <<END
-#include <iostream>
-
-int main() {
-  std::cout << "What up world!" << std::endl;
-  return 0;
-}
-
-END
+    @gen.create_gtest_main
   end
 end

data/lib/yesman/file_util.rb

@@ -30,16 +30,19 @@ class FileUtil
   end
 
   def self.write_to_file filename, contents
+    self.ensure_file filename
     File.open( filename, "w" ) { |f| f.write( contents ) }
   end
 private
 
   def self.create_directories dirs
     next_path = ""
+    exists = false
     dirs.each do |dirname|
       next_path << dirname << "/"
-      self.verify_or_make_dir next_path
+      exists = self.verify_or_make_dir next_path
     end
+    exists
   end
 
   def self.determine_path path
@@ -48,11 +51,17 @@ private
   end
 
   def self.verify_or_make_dir dirname
-    `mkdir #{dirname}` unless (File.exists? dirname) && (File.directory? dirname) 
+    pre_existing = (File.exists? dirname) && (File.directory? dirname)
+    `mkdir #{dirname}` unless pre_existing 
+    pre_existing
   end
 
   def self.verify_or_make_file filename
-    `touch #{filename}` unless (File.exists? filename)
+    pre_existing = (File.exists? filename)
+    unless pre_existing
+      `touch #{filename}`
+    end
+    pre_existing
   end
     
 end

data/lib/yesman/global_config.rb

@@ -0,0 +1,42 @@
+class GlobalConfig
+  attr_reader :pre_existing
+  attr_reader :global_config_path
+
+  def initialize
+    @pre_existing = false
+    @global_config_path =  "#{Dir.home}/.yesman"
+  end
+
+  def load
+    ensure_config_dir
+
+    if !pre_existing
+      puts "Copying file templates to #{global_config_path}" 
+      copy_templates
+      create_global_config
+    end
+  end
+
+  private
+
+  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_global_config
+    params = {};
+    params[:source] = "src"
+    params[:output] = "bin"
+    params[:tests] = "tests"
+    params[:ext] = "cpp"
+    #TODO Write these to a config file in global_config_path
+    #I'm not sold that you need them at this point
+  end
+  
+  def ensure_config_dir
+    @pre_existing = FileUtil.ensure_path global_config_path
+  end
+  
+end

data/lib/yesman/gtest_installer.rb

@@ -6,8 +6,7 @@ class GTestInstaller
   attr_reader :gtest_dir
   attr_reader :gtest_path
   attr_reader :attr_names
-  attr_reader :params
-
+  attr_reader :params 
   def initialize options
     @params = options
     @gtest_dir = "gtest"
@@ -29,13 +28,11 @@ class GTestInstaller
 private
 
   def print_start
-    puts "********************************"
-    puts "**     Google Test Setup      **"
-    puts "********************************"
+    puts "Google Test Setup"
   end
 
   def pull_source
-    puts "checkout (svn) of GTest source code..."
+    puts "svn checkout of GTest source code..."
     `svn checkout #{gtest_path} #{repo_path}`
   end
 
@@ -45,7 +42,6 @@ private
   end
 
   def create_static_lib
-    puts "creating GTest static lib: 'libgtest.a'"
     `ar -rv #{params[:tests]}/gtest/libgtest.a #{params[:tests]}/gtest/gtest-all.o`
   end
   
@@ -65,6 +61,7 @@ private
     FileUtil.kill_directory gtest_dir
     FileUtil.kill_file "#{params[:tests]}/gtest/gtest-all.o"
     FileUtil.kill_directory "#{params[:tests]}/gtest/include/gtest/.svn"
+    FileUtil.kill_directory "#{params[:tests]}/gtest/include/gtest/internal/.svn"
   end
 
   def repo_path

data/lib/yesman/templater.rb

@@ -0,0 +1,22 @@
+require 'erb'
+
+class Templater
+  
+  def merge class_type, template_path
+    @class_type = class_type
+    @template_path = template_path
+
+    load_template
+    apply_class_to_template
+    @output
+  end
+
+  def load_template
+    @loaded_template = ERB.new File.read( @template_path )
+  end
+
+  def apply_class_to_template
+    @output = @loaded_template.result( @class_type.get_binding ) 
+  end
+  
+end

data/lib/yesman/templates/class.cxx.erb

@@ -0,0 +1,14 @@
+#include "<%=class_name%>.h"
+<% if namespace %>
+namespace <%=namespace%> {
+<%end%>
+<%=class_name%>::<%=class_name%>() {
+  // TODO Auto-generated constructor stub
+}
+
+<%=class_name%>::~<%=class_name%>() {
+  // TODO Auto-generated destructor stub
+}
+<% if namespace %>
+} /* namespace <%=namespace%> */
+<%end%>

data/lib/yesman/templates/gtest_main.cxx.erb

@@ -0,0 +1,6 @@
+#include "gtest/gtest.h"
+
+GTEST_API_ int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

data/lib/yesman/templates/header.cxx.erb

@@ -0,0 +1,17 @@
+#ifndef <%=@class_name.upcase%>_H_
+#define <%=@class_name.upcase%>_H_
+<% if @super_class%>#include "<%=@super_class.class_name%>.h"<%end%>
+<% if @namespace %>
+namespace <%=@namespace%> {
+<%end%>
+class <%=@class_name%><%if @super_class%>: public <%if @super_class.namespace%><%=@super_class.namespace%>::<%end%><%=@super_class.class_name%><%end%> {
+public:
+  <%=@class_name%>();
+  virtual ~<%=@class_name%>();
+
+
+};
+<% if @namespace %>
+} /* namespace <%=@namespace%> */
+<%end%>
+#endif /* <%=@class_name.upcase%>_H_ */

data/lib/yesman/templates/main.cxx.erb

@@ -0,0 +1,6 @@
+#include <iostream>
+
+int main() {
+  std::cout << "What up world!!" << std::endl;
+  return 0;
+}

data/lib/yesman/templates/test.cxx.erb

@@ -0,0 +1,27 @@
+#include "gtest/gtest.h"
+#include "../<%=source%>/<%=@class_name%>.h"
+
+<%if @namespace%>using namespace <%=@namespace%>;<%end%>
+
+class <%=class_name%>Test : public testing::Test {
+protected:
+
+  virtual void SetUp() {
+    // Called before each test, dump if not necessary
+  }
+
+  virtual void TearDown() {
+    // Called after each test is run, dump if not necesary
+  }
+
+  // Declare any needed helper methods
+
+
+  // Declare variables your tests want to use
+
+
+};
+
+TEST_F(<%=class_name%>Test, Method) {
+  EXPECT_EQ( 1, 1 );
+}

data/lib/yesman/version.rb

@@ -1,3 +1,3 @@
 module Yesman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/yesman.rb

@@ -7,6 +7,7 @@ class Yesman
 
   def initialize options = {}
     create_defaults options
+    @cp = ConfigProxy.new
     init
   end
 
@@ -26,11 +27,14 @@ class Yesman
   end
 
   def create_all
+    @cp.create_config params
     p = CppCreator.new params
     p.create_project
+    puts "Project directories created"
 
     g = GTestInstaller.new params
     g.download_and_install
+
   end
 
 end

data/spec/class_type_spec.rb

@@ -0,0 +1,58 @@
+require 'helper'
+
+def create_class string
+  ex = ClassType.new
+  ex.parse_from_string string
+  ex
+end
+describe ClassType do
+
+  it "handles namespaced inheritance for both itself and parent" do
+    ct = ClassType.new
+    ct.parse_from_string "jsk::Testing < std::Parent"
+    ct.class_name.should eql "Testing"
+    ct.namespace.should eql "jsk"
+    ct.super_class.class_name.should eq "Parent"
+    ct.super_class.namespace.should eq "std"
+  end
+
+  it "should handle namespaced non inheritance" do
+    ct = create_class "jsk::Testing"
+    ct.class_name.should eq "Testing"
+    ct.namespace.should eq "jsk"
+    ct.super_class.should eq nil
+  end
+
+  it "should handle single class name with ns inheritance" do
+    cb = create_class "SingleTesting < jsk::Parent"
+    cb.class_name.should eq "SingleTesting"
+    cb.namespace.should eq nil
+    cb.super_class.namespace.should eq "jsk"
+    cb.super_class.class_name.should eq "Parent"
+  end
+
+  it "should handle non-ns for both self and super" do
+    cx = create_class "SingleTest < ParentTest"
+    cx.class_name.should eq "SingleTest"
+    cx.namespace.should eq nil
+    cx.super_class.namespace.should eq nil
+    cx.super_class.class_name.should eq "ParentTest"
+  end
+
+  it "should handle non-ns inherited" do
+    cj = create_class "jsk::BaseClass < Map"
+    cj.class_name.should eq "BaseClass"
+    cj.namespace.should eq "jsk"
+    cj.super_class.class_name.should eq "Map"
+    cj.super_class.namespace.should eq nil
+  end
+
+  it "should handle non inheritance, non ns" do
+    cp = create_class "FooBar"
+    cp.class_name.should eq "FooBar"
+    cp.namespace.should eq nil
+    cp.super_class.should eq nil
+  end
+end
+
+

data/spec/helper.rb

@@ -0,0 +1,2 @@
+require 'yesman/class_type'
+require 'yesman/templater'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yesman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -42,11 +42,23 @@ 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_util.rb
+- lib/yesman/global_config.rb
 - lib/yesman/gtest_installer.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/test.cxx.erb
 - lib/yesman/version.rb
+- spec/class_type_spec.rb
+- spec/helper.rb
 - yesman.gemspec
 homepage: ''
 licenses: []
@@ -73,4 +85,6 @@ signing_key:
 specification_version: 3
 summary: Yesman creates project directory structures, downloads and builds GTest for
   C++ development projects
-test_files: []
+test_files:
+- spec/class_type_spec.rb
+- spec/helper.rb