cxxproject 0.6.4 → 0.6.5

data/Rakefile.rb

@@ -15,6 +15,17 @@ begin
     sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
   end
 
+  desc "deploy gem to rubygems"
+  task :deploy => :gem do
+    require 'highline/import'
+    new_gem = "pkg/#{spec.name}-#{spec.version}.gem"
+    say "This will deploy #{new_gem} to rubygems server"
+    if agree("Are you sure you want to continue? [y/n]") then
+      sh "gem push #{new_gem}"
+    end
+  end
+
+
 
   begin
     require 'rdoc'
@@ -47,7 +58,7 @@ begin
       end
     end
     RoodiTask.new('roodi', spec.files)
-    task :agem => [:roodi]
+    task :gem => [:roodi]
   rescue LoadError # don't bail out when people do not have roodi installed!
       puts 'please gem install roodi'
   end
@@ -111,6 +122,5 @@ rescue LoadError => e
   puts 'to build the version history please gem install grit'
 end
 
-
 require './rake_helper/perftools'
 

data/lib/cxxproject/toolchain/provider.rb

@@ -120,7 +120,6 @@ module Cxxproject
       end
 
       def self.modify_cpp_compiler(based_on, h)
-        # chain = Marshal.load(Marshal.dump(@@settings[based_on]))
         chain = @@settings[based_on]
         raise "unknown toolchain: #{based_on}" unless chain
         chain[:COMPILER][:CPP].update(h)

data/lib/cxxproject/torake.rb

@@ -21,8 +21,9 @@ module Cxxproject
   class CxxProject2Rake
     attr_accessor :base, :all_tasks
 
-    def initialize(projects, build_dir, toolchain_name, base='.')
+    def initialize(projects, build_dir, toolchain_name, base='.', &option_block)
       load_cxx_plugins
+      option_block.call if option_block
       toolchain = Provider[toolchain_name]
       raise "no provider with name \"#{toolchain_name}\" found" unless toolchain
       @base = base
@@ -31,10 +32,10 @@ module Cxxproject
       end
 
       # TODO: this should be cleaned up somehow...
-      # if Utils::OS.linux?
-      #   toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
-      #   toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
-      # end
+      if Utils::OS.linux?
+        toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
+        toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
+      end
 
       Rake::application.deriveIncludes = true
 
@@ -62,7 +63,7 @@ module Cxxproject
     end
 
     def load_plugin(gem, pluginContext)
-      begin 
+      begin
         path = File.join(gem.full_gem_path, 'lib', 'plugin.rb')
         content = File.read(path)
         pluginContext.eval_plugin(content)

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.6.4"
+      "0.6.5"
     end
   end
 end

data/lib/tools/Rakefile.rb.template

@@ -5,6 +5,6 @@ unittest_flags = {
   :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
   :FLAGS => "-O0 -g3 -Wall"
 }
-toolchain = Provider.modify_cpp_compiler("<%= toolchain_name %>", unittest_flags)
+toolchain = Provider.modify_cpp_compiler("<%= toolchain %>", unittest_flags)
 dependent_projects =  ['./project.rb']
 CxxProject2Rake.new(dependent_projects, BuildDir, toolchain, './')

data/lib/tools/project_wizard.rb

@@ -2,90 +2,112 @@ require 'rake'
 require 'erb'
 require 'rubygems'
 
-def choose_toolchain
-  res = nil
-  toolchains = []
-  prefix = "cxxproject_"
-  toolchain_gems = Gem::Specification.find_all do |gem|
-    gem.name.start_with?(prefix)
-  end
-  if toolchain_gems.length > 0
-    choose do |menu|
-      menu.prompt = "choose a toolchain:"
-      toolchain_gems.each do |gem|
-        name = gem.name[prefix.length..-1]
-        menu.choice(name.to_sym) { res = name }
+def prepare_project(dir_name)
+  begin
+    require 'highline/import'
+    
+    say "This will create a new cxx-project in directory: '#{dir_name}'"
+    if confirm("Are you sure you want to continue") then
+      building_block = choose_building_block
+      generate_makefile = confirm("Do you also whant to generate a rakefile", building_block.eql?("exe"))
+      
+      toolchain = nil
+      if generate_makefile then
+        toolchain = choose_toolchain
+        return unless toolchain
       end
+
+      create_project(dir_name, building_block, toolchain, generate_makefile)
+      say "Completed project-setup ;-)"
+    else
+      say "Stopped project-setup!"
     end
-  else
-    say "no toolchains found...you need to install toolchain-gems in order to use cxxproject"
+    
+  rescue Interrupt
+    say "\nStopped project-setup!"
+  rescue LoadError
+    say "Please run 'gem install highline'"
   end
-  res
 end
 
 def choose_building_block
   res = nil
   choose do |menu|
-    menu.prompt = "what building block do you want to start with?"
-
+    say "What building-block do you whant to create?"
     menu.choice(:exe) { res = "exe" }
     menu.choice(:lib) { res = "source_lib" }
+    menu.prompt = "Select a building-block: "
   end
   res
 end
 
-def choose_generate_makefile
-  res = true
-  choose do |menu|
-    menu.prompt = 'generate rakefile?'
-    menu.choice(:yes) { res = true }
-    menu.choice(:no) { res = false }
+def choose_toolchain
+  res = nil
+  toolchains = []
+  toolchain_pattern = /cxxproject_(.*)toolchain/
+  Gem::Specification.find_all do |gem|
+    if gem.name =~ toolchain_pattern then
+      toolchains << $1
+    end
+  end
+  if toolchains.length > 0 then
+    choose do |menu|
+      say "What toolchain do you whant to use?"
+      toolchains.each do |toolchain|
+        menu.choice(toolchain.to_sym) { res = toolchain }
+      end
+      menu.prompt = "Select a toolchain: "
+    end
+  else
+    say "No toolchains installed!"
+    candidates = `gem list --remote "cxxproject_.*toolchain"`
+    say "You need at least one toolchain-plugin,- candidates are:\n#{candidates}"
   end
   res
 end
 
-def prepare_project(d)
-  begin
-    require 'highline/import'
-
-    if agree("This will create a new cxx-project config in dir \"#{d}\" \nAre you sure you want to continue? [yn] ")
-      tc = choose_toolchain
-      return unless tc
-      bb = choose_building_block
-      generate_makefile = choose_generate_makefile
-
-      create_project(d, bb, tc, generate_makefile)
-    else
-      say "stopped project creation"
-    end
-  rescue LoadError
-    puts "Please 'gem install highline'"
+def create_project(dir_name, building_block, toolchain, generate_rakefile)
+  rakefile_template = IO.read(File.join(File.dirname(__FILE__),"..","tools","Rakefile.rb.template"))
+  project_template = IO.read(File.join(File.dirname(__FILE__),"..","tools","project.rb.template"))
+  binding = create_binding("new-item", building_block, toolchain)
+  
+  if !File.directory?(dir_name) then
+    mkdir_p(dir_name, :verbose => false)
+  end
+  
+  rakefile_file = "#{dir_name}/Rakefile.rb"
+  if generate_rakefile && (!File.exists?(rakefile_file) || confirm("Override existing '#{rakefile_file}'")) then
+    write_template(rakefile_file, rakefile_template, binding)
+  end
+  
+  project_file = "#{dir_name}/project.rb"
+  if !File.exists?(project_file) || confirm("Override existing '#{project_file}'") then
+    write_template(project_file, project_template, binding)
   end
 end
 
+def create_binding(name, building_block, toolchain)
+  return binding()
+end
 
-def create_project(d, bb, tc, generate_rakefile)
-  rakefile_template = File.join(File.dirname(__FILE__),"..","tools","Rakefile.rb.template")
-  projectrb_template = File.join(File.dirname(__FILE__),"..","tools","project.rb.template")
-  s1 = IO.read(rakefile_template)
-  s2 = IO.read(projectrb_template)
-  name = "testme"
-  building_block = bb
-  toolchain_name = tc[/(.*?)toolchain/,1] 
-  mkdir_p(d, :verbose => false)
-  cd(d,:verbose => false) do
-    if ((File.exists? "Rakefile.rb") || (File.exists? "project.rb"))
-      abort "cannot create project in this directory, existing files would be overwritten!"
-    end
-    if generate_rakefile
-      write_template('Rakefile.rb', s1, binding)
-    end
-    write_template('project.rb', s2, binding)
+def write_template(file_name, template, binding)
+  say "...write: '#{file_name}'"
+  File.open(file_name, 'w') do |f|
+    f.write ERB.new(template).result(binding)
   end
 end
 
-def write_template(name, template_string, b)
-  File.open(name, 'w') do |f|
-    f.write ERB.new(template_string).result(b)
+def confirm(question, default = true)
+  res = nil
+  while res == nil
+    confirm = ask("#{question}? ") { |q| q.default = default ? "Y/n" : "y/N" }
+    if confirm.eql?("Y/n") || confirm.downcase.eql?("yes") || confirm.downcase.eql?("y") then
+      res = true
+    elsif confirm.eql?("y/N") || confirm.downcase.eql?("no") || confirm.downcase.eql?("n") then
+      res = false
+    else
+      say "Please enter \"yes\" or \"no\"."
+    end
   end
+  return res
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 Z
+date: 2012-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1495580368314725504
+      hash: 2926216662613263501
       segments: 
       - 0
       version: "0"