csd 0.0.13 → 0.0.14

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gemspec.homepage = "http://github.com/csd/csd"
     gemspec.authors = ["Technology Transfer Alliance Team"]
     gemspec.add_dependency "term-ansicolor", ">= 0"
-    gemspec.add_dependency "activesupport", ">= 0"
+    gemspec.add_dependency "active_support", ">= 0"
     gemspec.add_dependency "builder", ">= 0"
     gemspec.executables = ["csd"]
     gemspec.post_install_message = %q{

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bin/csd

@@ -5,4 +5,4 @@ require 'rubygems' # As a side note: Rubygems is already included for Ruby >= 1.
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'csd')
 
-CSD::Init.new
+Csd::Init.new

data/csd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technology Transfer Alliance Team"]
-  s.date = %q{2010-06-14}
+  s.date = %q{2010-06-22}
   s.default_executable = %q{csd}
   s.description = %q{CSD stands for Communication Systems Design and is a project of the Telecommunication Systems Laboratory (TSLab) of the Royal Institute of Technology in Stockholm, Sweden. Within CSD many software tools are used to build up various networks and services. This gem is supposed to automate processes to handle the compilation and installation of these software tools. Technology Transfer Alliance (TTA) is the project team, which maintains this code.}
   s.email = %q{mtoday11@gmail.com}
@@ -29,18 +29,24 @@ Gem::Specification.new do |s|
      "csd.gemspec",
      "lib/csd.rb",
      "lib/csd/applications/base.rb",
-     "lib/csd/applications/minisip/darwin/minisip_darwin.rb",
+     "lib/csd/applications/minisip/base.rb",
      "lib/csd/applications/minisip/init.rb",
-     "lib/csd/applications/minisip/linux/minisip_linux.rb",
-     "lib/csd/applications/minisip/minisip.rb",
+     "lib/csd/applications/minisip/unix/base.rb",
+     "lib/csd/commands.rb",
      "lib/csd/init.rb",
      "lib/csd/options.rb",
-     "lib/csd/path_struct.rb",
-     "lib/extensions/array.rb",
-     "lib/extensions/string.rb",
+     "lib/csd/path_container.rb",
+     "lib/extensions/core/array.rb",
+     "lib/extensions/core/file.rb",
+     "lib/extensions/core/object.rb",
+     "lib/extensions/core/pathname.rb",
+     "lib/extensions/core/string.rb",
+     "lib/extensions/gem/platform.rb",
      "publish",
+     "test/functional/test_commands.rb",
      "test/helper.rb",
-     "test/test_csd.rb"
+     "test/unit/test_pathname.rb",
+     "test/unit/test_string.rb"
   ]
   s.homepage = %q{http://github.com/csd/csd}
   s.post_install_message = %q{
@@ -63,8 +69,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Installation and compilation handler for software used in CSD projects.}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_csd.rb"
+    "test/functional/test_commands.rb",
+     "test/helper.rb",
+     "test/unit/test_pathname.rb",
+     "test/unit/test_string.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -73,16 +81,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<active_support>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
     else
       s.add_dependency(%q<term-ansicolor>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<active_support>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
     end
   else
     s.add_dependency(%q<term-ansicolor>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<active_support>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
   end
 end

data/lib/csd.rb

@@ -1,2 +1,2 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'extensions', '*.rb')) { |file| require file }
+Dir.glob(File.join(File.dirname(__FILE__), 'extensions', '**', '*.rb')) { |file| require file }
 require File.join(File.dirname(__FILE__), 'csd', 'init')

data/lib/csd/applications/base.rb

@@ -1,15 +1,18 @@
+require File.join(File.dirname(__FILE__), '..', 'commands')
 require 'rbconfig'
 
-module CSD
+module Csd
   module Application
     
-    # This is the root parent of all Applications
+    # This is the class root parent of all Applications
     #
     class Base
       
+      include Commands
       include Gem::UserInteraction
       
       attr_reader :gem_version, :options
+      attr_reader :after_build, :before_build # Dummies to be overwritten by methods
       attr_accessor :path
       
       def initialize(options={})
@@ -20,34 +23,10 @@ module CSD
       end
       
       def introduction
-        say "CSD Gem Version: #{gem_version}"
-        say
-        say "The working directory is:"
-        say path.root
+        say "CSD Version: #{gem_version}".blue
       end
       
-      def test_command(*args)
-        say "Testing command for success: #{args.join(' ')}".cyan
-        system(*args)
-      end
-      
-      def run_command(cmd)
-        log "Running command: #{cmd} in #{Dir.pwd}".magenta
-        ret = ''
-        unless options.dry
-          IO.popen(cmd) do |stdout|
-            stdout.each do |line|
-              say line
-              ret << line
-            end
-          end
-        end
-        ret
-      end
 
-      def log(msg="")
-        say msg.yellow unless options.silent
-      end
       
     end
   end

data/lib/csd/applications/minisip/base.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), '..', 'base')
+
+module Csd
+  module Application
+    module Minisip
+      class Base < Csd::Application::Base
+        
+        def introduction
+          super
+          define_paths
+          say " Working directory:   ".green + path.work.to_s.yellow
+          say " Your Platform:       ".green + Gem::Platform.local.humanize.to_s.yellow
+          say " Application module:  ".green + self.class.name.to_s.yellow
+          say
+          unless options.yes
+            exit unless ask_yes_no("Continue?".red.bold, true)
+          end
+          say
+          build!
+        end
+        
+        def build!
+          before_build
+          mkdir path.work
+          make_hdviper if checkout_hdviper or options.dry
+          checkout_minisip
+          make_minisip
+          after_build
+        end
+
+        def define_paths
+          path.work                      = Pathname.new(File.join(path.root, 'minisip'))
+          path.repository                = Pathname.new(File.join(path.work, 'repository'))
+          path.open_gl_display           = Pathname.new(File.join(path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'display', 'OpenGLDisplay.cxx'))
+          path.hdviper                   = Pathname.new(File.join(path.work, 'hdviper'))
+          path.hdviper_x264              = Pathname.new(File.join(path.hdviper, 'x264'))
+          path.hdviper_x264_test_x264api = Pathname.new(File.join(path.hdviper_x264, 'test', 'x264API'))
+          path.build                     = Pathname.new(File.join(path.work, 'build'))
+          path.build_include             = Pathname.new(File.join(path.build, 'include'))
+          path.build_lib                 = Pathname.new(File.join(path.build, 'lib'))
+          path.build_lib_pkg_config      = Pathname.new(File.join(path.build_lib, 'pkgconfig'))
+          path.build_share               = Pathname.new(File.join(path.build, 'share'))
+          path.build_share_aclocal       = Pathname.new(File.join(path.build_share, 'aclocal'))
+        end
+        
+        def checkout_hdviper
+          if path.hdviper.directory?
+            say "Skipping hdviper, because the directory already exists: #{path.hdviper}".green.bold
+          else
+            if path.hdviper.parent.writable? or options.dry
+              say "Downloading hdviper to: #{path.hdviper}".green.bold
+              run_command("svn co --quiet svn://hdviper.org/hdviper/wp3/src #{path.hdviper}")
+              return true
+            else
+              say "Could not download hdviper (no permission): #{path.hdviper}".red
+            end
+          end
+        end
+        
+        def make_hdviper
+          cd path.hdviper_x264
+          run_command('./configure')
+          run_command('make')
+          cd path.hdviper_x264_test_x264api
+          run_command('make')
+        end
+        
+        def checkout_minisip # TODO: Refactor because redudancy with checkout_hdviper
+          if path.repository.directory?
+            say "Skipping repository download, because the directory already exists: #{path.repository}".green.bold
+          else
+            if path.repository.parent.writable? or options.dry
+              say "Downloading minisip repository to: #{path.repository}".green.bold
+              run_command("git clone http://github.com/csd/minisip.git #{path.repository}")
+              # Fixing hard-coded stuff
+              new_file_content = File.read(path.open_gl_display).gsub('/home/erik', path.build)
+              File.open(path.open_gl_display, 'w+') { |file| file << new_file_content }
+              return true
+            else
+              say "Could not download minisip repository (no permission): #{path.hdviper}".red
+            end
+          end
+        end
+        
+        def make_minisip
+          [path.build, path.build_include, path.build_lib, path.build_share, path.build_share_aclocal].each { |target| mkdir target }
+          ['libmutil', 'libmnetutil', 'libmcrypto', 'libmikey', 'libmsip', 'libmstun', 'libminisip', 'minisip'].each do |library|
+            directory = Pathname.new(File.join(path.repository, library))
+            next if options.only and !options.only.include?(library)
+            if cd(directory) or options.dry
+              if options.bootstrap
+                say "Bootstrapping #{library}".green.bold
+                run_command("./bootstrap -I #{path.build_share_aclocal.enquote}")
+              end
+              if options.configure
+                say "Configuring #{library}".green.bold
+                individual_options = case library
+                  when 'libminisip'
+                    %Q{--enable-debug --enable-video --disable-mil --disable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{path.hdviper_x264_test_x264api} -I#{path.hdviper_x264}" LDFLAGS="#{File.join(path.hdviper_x264_test_x264api, 'libx264api.a')} #{File.join(path.hdviper_x264, 'libtidx264.a')} -lpthread -lrt"}
+                    #%Q{--enable-debug --enable-video --disable-mil --disable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{path.hdviper_x264}" LDFLAGS="#{File.join(path.hdviper_x264, 'libx264.a')} -lpthread -lrt"}
+                  when 'minisip'
+                    %Q{--enable-debug --enable-video --enable-textui --enable-opengl}
+                  else
+                    ''
+                end
+                run_command(%Q{./configure #{individual_options} --prefix=#{path.build.enquote} PKG_CONFIG_PATH=#{path.build_lib_pkg_config.enquote} ACLOCAL_FLAGS=#{path.build_share_aclocal} LD_LIBRARY_PATH=#{path.build_lib.enquote} --silent})
+              end
+              if options.make
+                say "Make #{library}".green.bold
+                run_command("make")
+              end
+              if options.make_install
+                say "Make install #{library}".green.bold
+                run_command("make install")
+              end
+            else
+              say "Skipping minisip library #{library} because it not be found: #{directory}".green.bold
+            end
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/csd/applications/minisip/init.rb

@@ -1,19 +1,16 @@
-require File.join(File.dirname(__FILE__), 'minisip')
 Dir.glob(File.join(File.dirname(__FILE__), '**', '*.rb')) { |file| require file }
 
-module CSD
+module Csd
   module Application
     module Minisip
       class Init
                 
         def self.application(*args)
-          case Gem::Platform.local
+          case Gem::Platform.local.os
             when 'linux'
-              MinisipLinux.new(*args)
-            when 'darwin'
-              MinisipDarwin.new(*args)
+              Unix::Base.new(*args)
             else
-              Minisip.new(*args)
+              Base.new(*args)
           end
         end
         

data/lib/csd/applications/minisip/unix/base.rb

@@ -0,0 +1,54 @@
+require File.join(File.dirname(__FILE__), '..', 'base')
+
+module Csd
+  module Application
+    module Minisip
+      module Unix
+        class Base < Csd::Application::Minisip::Base
+          
+          # A list of apt-get packages that are required by this application. 
+          #
+          DEBIAN_DEPENDENCIES = %w{ libssl-dev libglademm-2.4-dev libsdl-dev git-core subversion automake libtool libltdl3-dev build-essential libavcodec-dev libswscale-dev nasm yasm libasound2-dev libsdl-ttf2.0-dev }
+          
+          def before_build
+            fix_aclocal_dirlist
+            install_aptitude_dependencies
+          end
+        
+          def after_build
+            ldconfig_and_gtkgui
+          end
+
+          def install_aptitude_dependencies
+            DEBIAN_DEPENDENCIES.each do |apt|
+              run_command("sudo apt-get --yes install #{apt}")
+            end if options.apt_get
+          end
+        
+          def fix_aclocal_dirlist
+            return
+            content = '/usr/local/share/aclocal'
+            target = Pathname.new('/usr/share/aclocal/dirlist')
+            unless target.exist? and File.new(target).read == content # TODO: replace with File.read
+              begin
+                File.new(target, 'w').write(content).close              
+              rescue Errno::EACCES => e
+                say "Please run the following commands with the right permissions.".red.bold
+                say "  sudo rm /usr/share/aclocal/dirlist".green.bold
+                say "  sudo touch /usr/share/aclocal/dirlist".green.bold
+                say "  sudo echo /usr/local/share/aclocal >> /usr/share/aclocal/dirlist".green.bold
+                exit
+              end
+            end
+          end
+
+          def ldconfig_and_gtkgui
+            run_command("ldconfig /usr/local/lib/libminisip.so.0")
+            run_command("minisip_gtkgui")
+          end
+        
+        end
+      end
+    end
+  end
+end

data/lib/csd/commands.rb

@@ -0,0 +1,171 @@
+require 'pathname'
+require 'ostruct'
+require 'active_support'
+
+module Csd
+  # This module contains wrapper methods for standard file system commands. They are meant to be
+  # a little bit more robust (e.g. raising no exceptions) and return elaborate feedback on their operation.
+  #
+  module Commands
+    
+    # The Process module is a collection of methods used to manipulate processes.
+    # We use it to check whether we run as sudo or not by evaluating the uid of ths user (if it's 0 it's root)
+    include Process
+    
+    # Objects of this class can be returned by Commands. Since it is an OpenStruct object,
+    # it can contain an arbritary number of values.
+    #
+    class CommandResult < OpenStruct
+      
+      # This creates an convenient, read-only accessor for the OpenStruct object values.
+      # It simply maps methods that end with a <tt>?</tt> to the same method without <tt>?</tt>.
+      #
+      # ==== Examples
+      #
+      #   command_result.something? # => command_result.something
+      #
+      def method_missing(meth, *args, &block)
+        meth.to_s.ends_with?('?') ? self.send(meth.to_s.chop.to_sym, *args, &block) : super
+      end
+      
+    end
+    
+    # Creates a directory recursively.
+    #
+    # ==== Returns
+    #
+    # This method returns a CommandResult object with the following values:
+    #
+    # [+success?+]         +true+ if the directory exists after the operation, +nil+ if not.
+    # [+already_existed?+] +true+ if the directory existed before the operation, +nil+ if not.
+    # [+writable?+]        +true+ if the directory is writable, +false+ if not, +nil+ if the directory doesn't exist.
+    #
+    # ==== Examples
+    #
+    #  result = mkdir('foo')    # => #<CommandResult...>
+    #  result.success?          # => true
+    #  result.already_existed?  # => false
+    #
+    #  puts "I created a directory" if mkdir('bar').success?
+    #
+    #  mkdir('i/can/create/directories/recursively')
+    #
+    def mkdir(target)
+      target = target.pathnamify
+      result = CommandResult.new
+      if target.directory?
+        # Don't say anything if the directory already exists
+        result.already_existed = true
+      else
+        begin
+          say "Creating directory: #{target}".cyan unless options.quiet
+          # Try to create the directory
+          target.mkpath unless options.dry
+        rescue Errno::EACCES => e
+           say "Cannot create directory (no permission): #{target}".red unless options.quiet
+           return result
+        end
+      end
+      result.success  = (target.directory? or options.dry)
+      result.writable = (target.writable? or options.dry)
+      result
+    end
+    
+    # Changes the current directory.
+    #
+    # ==== Returns
+    #
+    # This method returns a CommandResult object with the following values:
+    #
+    # [+success?+] +true+ if pwd is where it was requested to be after the operation, +nil+ if not.
+    #
+    def cd(target)
+      target = target.pathnamify
+      result = CommandResult.new
+      if target.directory? or options.dry
+        say "cd #{target}".yellow
+        Dir.chdir(target)
+      elsif target.exist?
+        say "Cannot change to directory because it exists but is not a directory: #{target}".red
+      end
+      result.success = (target.current_path? or options.dry)
+      result
+    end
+    
+    # Runs a command on the system.
+    #
+    # ==== Returns
+    #
+    # The command's output as an +Array+. Note that the exit code can be accessed via the global variable <tt>$?</tt>
+    #
+    # ==== Options
+    #
+    # The following options can be passed as a hash.
+    #
+    # [+:exit_on_failure+] If the exit code of the command was not 0, exit the CSD application.
+    #
+    #
+    def sh(cmd, params={})
+      default_params = { :exit_on_failure => true }
+      params = default_params.merge(params)
+      say "Running command in #{Dir.pwd}".yellow unless options.silent
+      say cmd.cyan
+      ret = ''
+      unless options.dry
+        IO.popen(cmd) do |stdout|
+          stdout.each do |line|
+            say "       #{line}" if options.verbose
+            ret << line
+          end
+        end
+      end
+      exit_if_last_command_had_errors if params[:exit_on_failure]
+      ret
+    end
+    
+    
+    def test_command(*args)
+      say "Testing command for success: #{args.join(' ')}".yellow
+      system(*args)
+    end
+    
+    def run_command(cmd, params={})
+      default_params = { :exit_on_failure => true }
+      params = default_params.merge(params)
+      say "Running command in #{Dir.pwd}".yellow unless options.quiet
+      say cmd.cyan
+      ret = ''
+      unless options.dry
+        IO.popen(cmd) do |stdout|
+          stdout.each do |line|
+            say "       #{line}"
+            ret << line
+          end
+        end
+      end
+      exit_if_last_command_had_errors if params[:exit_on_failure]
+      ret
+    end
+    
+    def exit_if_last_command_had_errors
+      unless $?.try(:success?) or options.dry
+        say "The last command was unsuccessful.".red unless options.quiet
+        exit
+      end
+    end
+    
+    
+    def say(something='')
+    end
+
+    def log(msg="")
+      say msg.yellow unless options.silent
+    end
+    
+    # Dummy to be overwritten by real options
+    def options
+      OpenStruct.new
+    end
+  
+  end
+end

data/lib/csd/init.rb

@@ -6,7 +6,12 @@ require 'ostruct'
 require 'tmpdir'
 require 'active_support/core_ext'
 
-module CSD
+# This namespace is given to the entire CSD gem.
+#
+module Csd
+  # On initialization, this class bootstraps and runs the CSD gem.
+  # The initialization is most likely be done by the `csd´ executable.
+  #
   class Init
     
     include Gem::UserInteraction
@@ -16,7 +21,7 @@ module CSD
     def initialize
       @options     = Options.parse
       @path        = path_struct
-      @gem_version = File.new(File.join(path.gem_root, 'VERSION')).read
+      @gem_version = File.read(File.join(path.gem_root, 'VERSION'))
       validate_arguments
       @application = initialize_application
       @application.introduction
@@ -24,7 +29,7 @@ module CSD
     end
     
     def path_struct
-      path = PathStruct.new
+      path = PathContainer.new
       if options.path
         if File.directory?(options.path)
           path.root = File.expand_path(options.path)
@@ -53,7 +58,7 @@ module CSD
       directory_name = ARGV.second.underscore
       begin
         require File.join(File.join(path.applications, "#{directory_name}"), 'init.rb')
-        "CSD::Application::#{directory_name.camelize}::Init".constantize.application(:gem_version => @gem_version, :options => @options, :path => @path)
+        "Csd::Application::#{directory_name.camelize}::Init".constantize.application(:gem_version => @gem_version, :options => @options, :path => @path)
       rescue LoadError
         say "Unknown application: #{directory_name}"
         exit

data/lib/csd/options.rb

@@ -2,7 +2,7 @@ require 'optparse'
 require 'optparse/time'
 require 'ostruct'
 
-module CSD
+module Csd
   class Options
 
     #
@@ -10,14 +10,17 @@ module CSD
     #
     def self.parse
       # Default options
-      options        = OpenStruct.new
-      options.temp   = false
-      options.silent = false
-      options.dry    = false
+      options              = OpenStruct.new
+      options.temp         = false
+      options.silent       = false
+      options.dry          = false
       options.bootstrap    = true
       options.configure    = true
       options.make         = true
       options.make_install = true
+      options.owner        = nil
+      options.apt_get      = true
+      options.yes          = false
 
       # Parse the command line options
       OptionParser.new do |opts|
@@ -41,28 +44,53 @@ module CSD
           options.dry = value
         end
 
-        opts.on("-d", "--no-bootstrap","Don't run the bootstrap command") do |value|
+        opts.on("-y", "--yes","Answering all questions with 'yes'") do |value|
+          options.yes = value
+        end
+        
+        opts.on("-na", "--no-apt-get","Don't run any apt-get commands") do |value|
+          options.apt_get = value
+        end
+        
+        opts.on("-nb", "--no-bootstrap","Don't run any bootstrap commands") do |value|
           options.bootstrap = value
         end
         
-        opts.on("-d", "--no-configure","Don't run the configure command") do |value|
+        opts.on("-nc", "--no-configure","Don't run any configure commands") do |value|
           options.configure = value
         end
         
-        opts.on("-d", "--no-make","Don't run the make command") do |value|
+        opts.on("-nm", "--no-make","Don't run any make commands") do |value|
           options.make = value
         end
         
-        opts.on("-d", "--no-make-install","Don't run the make install command") do |value|
+        opts.on("-nmi", "--no-make-install","Don't run any make install commands") do |value|
           options.make_install = value
         end
         
+        opts.on("--only libmcrypto,libmnetuli,etc.", Array, "Include only these libraries") do |list|
+          options.only = list
+        end
+
+        opts.on("-o", "--owner [OWNER]","Specify OWNER:GROUP for this operation") do |value|
+          options.owner = value
+        end
+        
         opts.on("-p", "--path [PATH]",
                 "Defines the working directory manually.",
                 "(This will override the --temp option)") do |value|
           options.path = value
         end
         
+        
+        opts.on("-d", "--debug","Show debugging information") do |value|
+          options.quiet = value
+        end
+        
+        opts.on("--verbose","Show elaborate output") do |value|
+          options.quiet = value
+        end
+                
         opts.on("-s", "--silent","Don't show any output") do |value|
           options.silent = value
         end
@@ -73,10 +101,19 @@ module CSD
         end
 
         opts.on_tail("-v", "--version", "Show version") do
-          puts "CSD Gem Version: #{CSD::Init::GEM_VERSION}"
+          puts "CSD Gem Version: #{File.read(File.join(PathContainer.new.gem_root, 'VERSION'))}"
           exit
         end
-      end.parse!
+      end
+      
+      #.parse!
+      
+      if options.owner
+        chmod = options.owner.split(':')
+        options.owner = chmod.first
+        options.group = chmod.last
+      end
+      
       options
     end
 

data/lib/csd/{path_struct.rb → path_container.rb}

@@ -1,7 +1,7 @@
 require 'ostruct'
 
-module CSD
-  class PathStruct < OpenStruct
+module Csd
+  class PathContainer < OpenStruct
     
     def gem_root
       File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))

data/lib/extensions/core/array.rb

@@ -0,0 +1,13 @@
+module Csd
+  module Extensions
+    module Core
+      module Array
+
+      end
+    end
+  end
+end
+
+class Array #:nodoc:
+  include Csd::Extensions::Core::Array
+end

data/lib/extensions/core/file.rb

@@ -0,0 +1,13 @@
+module Csd
+  module Extensions
+    module Core
+      module File
+        
+      end
+    end
+  end
+end
+
+class File #:nodoc:
+  extend Csd::Extensions::Core::File
+end

data/lib/extensions/core/object.rb

@@ -0,0 +1,22 @@
+module Csd
+  module Extensions
+    module Core
+      module Object
+        
+        # Creates a Pathname object from the current object. Preferrably from Strings and Hashes.
+        #
+        def pathnamify
+          case self
+            when ::Pathname then self
+            else ::Pathname.new(self)
+          end
+        end
+        
+      end
+    end
+  end
+end
+
+class Object #:nodoc:
+  include Csd::Extensions::Core::Object
+end

data/lib/extensions/core/pathname.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), 'string')
+
+module Csd
+  module Extensions
+    module Core
+      module Pathname
+  
+        def enquote
+          to_s.enquote
+        end
+        
+        def current_path?
+          self.exist? and self.realpath == self.class.getwd.realpath
+        end
+      
+      end
+    end
+  end
+end
+
+class Pathname #:nodoc:
+  include Csd::Extensions::Core::Pathname
+end

data/lib/extensions/core/string.rb

@@ -0,0 +1,20 @@
+require 'term/ansicolor'
+
+module Csd
+  module Extensions
+    module Core
+      module String
+  
+        def enquote
+          %Q{"#{self}"}
+        end
+        
+      end
+    end
+  end
+end
+
+class String #:nodoc:
+  include Term::ANSIColor
+  include Csd::Extensions::Core::String
+end

data/lib/extensions/gem/platform.rb

@@ -0,0 +1,20 @@
+module Csd
+  module Extensions
+    module Gem
+      module Platform
+  
+        def humanize
+          version_string = version ? ", version #{version}" : ''
+          "#{os} (CPU: #{cpu}#{version_string})"
+        end
+  
+      end
+    end
+  end
+end
+
+module Gem
+  class Platform #:nodoc:
+    include Csd::Extensions::Gem::Platform
+  end
+end

data/test/functional/test_commands.rb

@@ -0,0 +1,98 @@
+require 'helper'
+require 'ostruct'
+
+class Cmd
+  include Csd::Commands
+  attr_accessor :options
+  def initialize
+    @options = OpenStruct.new({ :silent => true, :quiet => true, :dry => false })
+  end
+end
+
+class TestCommands < Test::Unit::TestCase
+  
+  context "As a directory function" do
+  
+    setup do
+      @cmd    = Cmd.new
+      @tmp    = Dir.mktmpdir
+      @dir    = Pathname.new File.join(@tmp, 'folder')
+      @subdir = Pathname.new File.join(@dir, 'subfolder')
+    end
+
+    teardown do
+      FileUtils.rm_r(@tmp)
+    end
+    
+    context "mkdir" do
+  
+      should "return the proper CommandResult if the directory already existed" do
+        ensure_mkdir(@dir)
+        assert_kind_of(Cmd::CommandResult, result = @cmd.mkdir(@dir))
+        assert result.success?
+        assert result.already_existed?
+        assert result.writable?
+      end
+      
+      should "return the proper CommandResult if the directory already existed in dry mode" do
+        @cmd.options.dry = true
+        ensure_mkdir(@dir)
+        assert_kind_of(Cmd::CommandResult, result = @cmd.mkdir(@dir))
+        assert result.success?
+        assert result.already_existed?
+        assert result.writable?
+      end
+      
+      should "create the directory if it doesn't exist yet" do
+        assert_kind_of(Cmd::CommandResult, result = @cmd.mkdir(@dir))
+        assert result.success?
+        assert !result.already_existed?
+        assert result.writable?
+      end
+      
+      should "create the directory if it doesn't exist yet in dry mode" do
+        @cmd.options.dry = true
+        assert_kind_of(Cmd::CommandResult, result = @cmd.mkdir(@dir))
+        assert result.success?
+        assert !result.already_existed?
+        assert result.writable?
+      end
+      
+      should "notify if there is no permission to create the directory" do
+        ensure_mkdir(@dir)
+        @dir.chmod(0000)
+        assert_kind_of(Cmd::CommandResult, result = @cmd.mkdir(@dir))
+        assert result.success?
+        assert result.already_existed?
+        assert !result.writable?
+        Pathname.new(@dir).chmod(0777) # Cleanup
+      end
+      
+    end # context "mkdir"
+
+    context "cd" do
+      
+      should "return a CommanResult with success? if the directory was changed successfully" do
+        assert_kind_of(Cmd::CommandResult, result = @cmd.cd('/'))
+        assert result.success?
+        assert_kind_of(Cmd::CommandResult, result = @cmd.cd(@tmp))
+        assert result.success?
+      end
+      
+      should "realize when the target is not a directory, but a file or something" do
+        testfile_path = File.join(@tmp, 'testfile')
+        File.new(testfile_path, 'w')
+        assert_kind_of(Cmd::CommandResult, result = @cmd.cd(testfile_path))
+        assert !result.success?
+      end
+      
+      should "realize when the target doesn't exist" do
+        assert_kind_of(Cmd::CommandResult, result = @cmd.cd('/i/for/sure/dont/exist'))
+        assert !result.success?
+      end
+      
+    end # context "cd"
+  
+  end # context "As a directory function"
+
+end

data/test/helper.rb

@@ -1,10 +1,20 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'tmpdir'
+require 'redgreen'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'csd'
 
 class Test::Unit::TestCase
-end
+
+  def ensure_mkdir(target)
+    target = Pathname.new(target) unless target.is_a?(Pathname)
+    target.mkpath
+    assert target.directory?
+    target
+  end
+
+end

data/test/unit/test_pathname.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+class TestPathname < Test::Unit::TestCase
+  
+  context "A normal Pathname object" do
+  
+    should "be enquotable" do
+      assert_equal '"/"', Pathname.new('/').enquote
+    end
+    
+    should "know if its the current pwd or not (regardless of the requested directory actually existing)" do
+      Dir.chdir('/tmp')
+      assert Pathname.new('/tmp').current_path?
+      assert !Pathname.new('/i/do/not/exist').current_path?
+    end
+  
+  end
+
+end

data/test/unit/test_string.rb

@@ -0,0 +1,13 @@
+require 'helper'
+
+class TestString < Test::Unit::TestCase
+  
+  context "A normal String object" do
+  
+    should "be enquotable" do
+      assert_equal '"wow it works"', 'wow it works'.enquote
+    end
+  
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +02:00
+date: 2010-06-22 00:00:00 +02:00
 default_executable: csd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: active_support
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -80,18 +80,24 @@ files:
 - csd.gemspec
 - lib/csd.rb
 - lib/csd/applications/base.rb
-- lib/csd/applications/minisip/darwin/minisip_darwin.rb
+- lib/csd/applications/minisip/base.rb
 - lib/csd/applications/minisip/init.rb
-- lib/csd/applications/minisip/linux/minisip_linux.rb
-- lib/csd/applications/minisip/minisip.rb
+- lib/csd/applications/minisip/unix/base.rb
+- lib/csd/commands.rb
 - lib/csd/init.rb
 - lib/csd/options.rb
-- lib/csd/path_struct.rb
-- lib/extensions/array.rb
-- lib/extensions/string.rb
+- lib/csd/path_container.rb
+- lib/extensions/core/array.rb
+- lib/extensions/core/file.rb
+- lib/extensions/core/object.rb
+- lib/extensions/core/pathname.rb
+- lib/extensions/core/string.rb
+- lib/extensions/gem/platform.rb
 - publish
+- test/functional/test_commands.rb
 - test/helper.rb
-- test/test_csd.rb
+- test/unit/test_pathname.rb
+- test/unit/test_string.rb
 has_rdoc: true
 homepage: http://github.com/csd/csd
 licenses: []
@@ -127,5 +133,7 @@ signing_key:
 specification_version: 3
 summary: Installation and compilation handler for software used in CSD projects.
 test_files: 
+- test/functional/test_commands.rb
 - test/helper.rb
-- test/test_csd.rb
+- test/unit/test_pathname.rb
+- test/unit/test_string.rb

data/lib/csd/applications/minisip/darwin/minisip_darwin.rb

@@ -1,12 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'minisip')
-
-module CSD
-  module Application
-    module Minisip
-      class MinisipDarwin < Minisip
-        
-        
-      end
-    end
-  end
-end

data/lib/csd/applications/minisip/linux/minisip_linux.rb

@@ -1,36 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'minisip')
-
-module CSD
-  module Application
-    module Minisip
-      class MinisipLinux < Minisip
-        
-        def build!
-          define_paths
-          create_working_dir
-          install_aptitude_dependencies
-          checkout_repository
-          make_libraries
-          fix_aclocal_dirlist
-          ldconfig_and_gtkgui
-        end
-        
-        def install_aptitude_dependencies
-          ['git-core', 'subversion', 'automake', 'libssl-dev', 'libtool', 'libglademm-2.4-dev'].each do |apt|
-            run_command("sudo apt-get --yes install #{apt}")
-          end
-        end
-        
-        def fix_aclocal_dirlist
-          run_command "sudo echo /usr/local/share/aclocal >> /usr/share/aclocal/dirlist"
-        end
-
-        def ldconfig_and_gtkgui
-          run_command("ldconfig /usr/local/lib/libminisip.so.0")
-          run_command("minisip_gtkgui")
-        end
-        
-      end
-    end
-  end
-end

data/lib/csd/applications/minisip/minisip.rb

@@ -1,75 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'base')
-
-module CSD
-  module Application
-    module Minisip
-      class Minisip < CSD::Application::Base
-                
-        def introduction
-          super
-          log
-          log "Hello, I'm the application #{self.class.name}"
-          exit unless ask_yes_no("Continue?", true)
-          build!
-        end
-        
-        def build!
-          define_paths
-          create_working_dir
-          checkout_repository
-          make_libraries
-        end
-
-        def define_paths
-          path.work       = File.expand_path(File.join(path.root, 'minisip_building'))
-          path.repository = File.expand_path(File.join(path.work, 'repository'))
-        end
-        
-        def create_working_dir
-          if File.directory?(path.work)
-            log "Working directory ´#{path.work}´ already exists."
-          else
-            log "Creating working directory ´#{path.work}´"
-            Dir.mkdir(path.work)
-          end
-          Dir.chdir(path.work)
-        end
-        
-        def checkout_repository
-          if File.directory?(path.repository)
-            log "The minisip repository already exists in ´#{path.repository}´"
-          else
-            log "Checking out minisip repository to ´#{path.repository}´"
-            #run_command("git clone http://github.com/csd/minisip.git repository")
-            if test_command('svn', 'info', 'svn://minisip.org/minisip/trunk')
-              run_command("svn co svn://minisip.org/minisip/trunk #{path.repository}")
-            else
-              log "Sorry, something is wrong with subversion.".red.bold
-              exit
-            end
-          end
-        end
-        
-        def make_libraries
-          ['libmutil', 'libmnetutil', 'libmcrypto', 'libmikey', 'libmsip', 'libmstun', 'libminisip'].each do |lib|
-            lib_dir = File.join(path.repository, lib)
-            if File.directory?(lib_dir)
-              Dir.chdir(lib_dir)
-              log "Bootstrapping #{lib}".green.bold
-              run_command("./bootstrap")
-              log "Configuring #{lib}".green.bold
-              run_command("./configure")
-              log "Make #{lib}".green.bold
-              run_command("make")
-              log "Make install #{lib}".green.bold
-              run_command("make install")
-            else
-              log "Skipping ´#{lib}´ because ´#{lib_dir}´ could not be found".red.bold
-            end
-          end
-        end
-        
-      end
-    end
-  end
-end

data/lib/extensions/array.rb

@@ -1,7 +0,0 @@
-module ArrayExtensions
-  
-end
-
-class Array #:nodoc:
-  include ArrayExtensions
-end

data/lib/extensions/string.rb

@@ -1,15 +0,0 @@
-require 'term/ansicolor'
-#require 'active_support'
-
-module StringExtensions
-  
-  #def constantize
-  #  ActiveSupport::Inflector.constantize(self)
-  #end
-  
-end
-
-class String #:nodoc:
-  include Term::ANSIColor
-  include StringExtensions
-end

data/test/test_csd.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestCsd < Test::Unit::TestCase
-  should "something important" do
-    assert true
-  end
-end