csd 0.0.16 → 0.1.0

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gemspec.email = "mtoday11@gmail.com"
     gemspec.homepage = "http://github.com/csd/csd"
     gemspec.authors = ["Technology Transfer Alliance Team"]
-    gemspec.add_dependency "term-ansicolor", ">= 0"
-    gemspec.add_dependency "activesupport", "3.0.0.beta3"  # needs to be active_support in the next release of it, I guess
+    #gemspec.add_dependency "term-ansicolor", ">= 0"
+    #gemspec.add_dependency "activesupport", "3.0.0.beta3"  # needs to be active_support in the next release of it, I guess
     gemspec.executables = ["ai"]
     gemspec.post_install_message = %q{
     ==================================================================================

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.1.0

data/csd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.0.16"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technology Transfer Alliance Team"]
@@ -305,15 +305,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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>, ["= 3.0.0.beta3"])
     else
-      s.add_dependency(%q<term-ansicolor>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
     end
   else
-    s.add_dependency(%q<term-ansicolor>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
   end
 end
 

data/lib/csd/application/default/base.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 module CSD
   # This namespace holds all individual application Modules
   #

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

@@ -8,6 +8,7 @@ module CSD
         def compile!
           define_root_path
           define_paths
+          fix_ubuntu_10_04 and return if Options.only_fix_giomm
           UI.separator
           UI.info "This operation will download and compile MiniSIP.".green.bold
           UI.separator
@@ -27,17 +28,13 @@ module CSD
         end
 
         def compile_process
-          unless Options.only_fix_giomm
-            before_compile
-            Cmd.mkdir Path.work
-            make_hdviper if checkout_hdviper or Options.dry
-            checkout_minisip
-          end
-          fix_ubuntu_10_04 if Gem::Platform.local.kernel_version == '#36-Ubuntu SMP Thu Jun 3 22:02:19 UTC 2010' or Options.only_fix_giomm
-          unless Options.only_fix_giomm
-            make_minisip
-            after_compile
-          end
+          before_compile
+          Cmd.mkdir Path.work
+          make_hdviper if checkout_hdviper or Options.dry
+          checkout_minisip
+          fix_ubuntu_10_04 if Gem::Platform.local.kernel_version == '#36-Ubuntu SMP Thu Jun 3 22:02:19 UTC 2010'
+          make_minisip
+          after_compile
         end
                 
         def define_root_path
@@ -66,7 +63,7 @@ module CSD
           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'))
-          Path.giomm_header              = Pathname.new(File.join('/', 'usr', 'bin', 'giomm', 'giomm.h'))
+          Path.giomm_header              = Pathname.new(File.join('/', 'usr', 'include', 'giomm-2.4', 'giomm.h'))
         end
         
         def checkout_hdviper
@@ -108,13 +105,17 @@ module CSD
         end
         
         def fix_ubuntu_10_04
-          Path.new_giomm_header = File.join(Dir.mktmpdir, 'header.h')
-          Cmd.copy(Path.giomm_header, Path.new_giomm_header)
-          Cmd.replace(Path.new_giomm_header, '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>")
-          Cmd.replace(Path.new_giomm_header, '#include <giomm/srvtarget.h>', "#include <giomm/srvtarget.h>\n ----- AI COMMENTING OUT END ----- */")
-          Cmd.replace(Path.new_giomm_header, '#include <giomm/unixconnection.h>', "// #include <giomm/unixconnection.h>  // COMMENTED OUT BY AI")
-          Cmd.run("sudo cp #{Path.giomm_header} #{Path.giomm_header}.backup")
-          Cmd.run("sudo cp #{Path.new_giomm_header} #{Path.giomm_header}")
+          if File.exist?("#{Path.giomm_header}.ai-backup")
+            UI.warn "giomm-2.4 seems to be fixed already, I won't touch it. Delete `#{"#{Path.giomm_header}.ai-backup"}´ to enforce it."
+          else
+            Path.new_giomm_header = File.join(Dir.mktmpdir, 'giomm.h')
+            Cmd.copy(Path.giomm_header, Path.new_giomm_header)
+            Cmd.replace(Path.new_giomm_header, '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>")
+            Cmd.replace(Path.new_giomm_header, '#include <giomm/srvtarget.h>', "#include <giomm/srvtarget.h>\n ----- AI COMMENTING OUT END ----- */")
+            Cmd.replace(Path.new_giomm_header, '# include <giomm/unixconnection.h>', "// #include <giomm/unixconnection.h>  // COMMENTED OUT BY AI")
+            Cmd.run("sudo cp #{Path.giomm_header} #{Path.giomm_header}.backup")
+            Cmd.run("sudo cp #{Path.new_giomm_header} #{Path.giomm_header}")
+          end
         end
         
         def make_minisip

data/lib/csd/application/minisip/options/compile.rb

@@ -24,6 +24,11 @@ end
 #  end
 #end
 
+self.only_fix_giomm = false
+opts.on("--only-fix-giomm","Forces the AI to do nothing except trying to bugfix the Ubuntu 10.04 giomm") do |value|
+  self.only_fix_giomm = value
+end
+
 self.apt_get = true
 opts.on("--no-apt-get","Don't run any apt-get commands") do |value|
   self.apt_get = value

data/lib/csd/commands.rb

@@ -99,7 +99,7 @@ module CSD
     # Copies one or several files to the destination
     #
     def copy(src, dest)
-      FileUtils.cp(src, dest)
+      FileUtils.cp(src, dest) unless (Options.dry or Options.reveal)
     end
     
     # This returns the current pwd. However, it will return a fake result if we are in reveal-commands-mode.
@@ -126,11 +126,11 @@ module CSD
         UI.info "Modifying contents of `#{filepath}´ as follows:".blue
         UI.info "  (Replacing all occurences of `#{pattern}´ with `#{substitution}´)".blue
         new_file_content = File.read(filepath).gsub(pattern, substitution)
-        File.open(filepath, 'w+') { |file| file << new_file_content }
+        File.open(filepath, 'w+') { |file| file << new_file_content } unless (Options.dry or Options.reveal)
       rescue Errno::ENOENT => e
         result.success = false
       end
-      result.success = true
+      result.success = true if Options.reveal
       result
     end
     
@@ -153,7 +153,7 @@ module CSD
         UI.info "Running command in #{pwd}".yellow
         UI.info cmd.cyan
       end
-      return '' if Options.reveal
+      return '' if Options.reveal or Options.dry
       ret = ''
       IO.popen(cmd) do |stdout|
         stdout.each do |line|
@@ -180,7 +180,7 @@ module CSD
   # Wrapping the CommandsInstance class
   #
   class Cmd
-    COMMANDS = %w{ mkdir cd run replace }
+    COMMANDS = %w{ mkdir cd run replace copy }
     
     def self.instance
       @@instance ||= CommandsInstance.new

data/test/unit/test_dir.rb

@@ -22,7 +22,7 @@ class TestDir < Test::Unit::TestCase
   
       should "return all subdirectory names as an array" do
         result = Dir.directories(@tmp).map { |dirname| dirname }
-        assert_equal @subdirs.sort, result
+        assert_equal @subdirs.sort, result.sort
       end
       
       should "yield all subdirectories in a block" do

data/test/unit/test_pathname.rb

@@ -35,7 +35,7 @@ class TestPathname < Test::Unit::TestCase
   
       should "return all subdirectory names as an array" do
         result = Pathname.new(@tmp).children_directories.map { |pathname| pathname }
-        assert_equal @subdirs.sort, result
+        assert_equal @subdirs.sort, result.sort
       end
       
       should "yield all subdirectories in a block" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 16
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -17,38 +17,8 @@ cert_chain: []
 
 date: 2010-07-13 00:00:00 +02:00
 default_executable: ai
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1848230021
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta3
-        version: 3.0.0.beta3
-  type: :runtime
-  version_requirements: *id002
+dependencies: []
+
 description: 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.
 email: mtoday11@gmail.com
 executables: