Make Cangallo a class instead of a module

bin/canga

@@ -13,9 +13,7 @@ require "tempfile"
 
 require "pp"
 
-include Cangallo
-
-$config = Config.new
+$config = Cangallo::Config.new
 
 class Canga < Thor
   class_option :repo, :desc => 'repository to use'
@@ -24,7 +22,7 @@ class Canga < Thor
   option :parent, :desc => "id of the parent image"
   def create(file, size=nil)
     puts [file, size]
-    Qcow2.create(file, options[:parent], size)
+    Cangallo::Qcow2.create(file, options[:parent], size)
   end
 
   desc "add FILE", "add a new file to the repository"
@@ -113,7 +111,7 @@ class Canga < Thor
 
     path = File.expand_path(repo.image_path(sha256))
 
-    Qcow2.create_from_base(path, file)
+    Cangallo::Qcow2.create_from_base(path, file)
   end
 
   desc "build CANGAFILE", "create a new image using a Cangafile"
@@ -136,7 +134,7 @@ class Canga < Thor
     temp_image = Tempfile.new([File.basename(file), '.qcow2'], repo.path)
     temp_image.close
 
-    Qcow2.create_from_base(parent_path, temp_image.path)
+    Cangallo::Qcow2.create_from_base(parent_path, temp_image.path)
 
     rc = LibGuestfs.virt_customize(temp_image.path, cangafile.libguestfs_commands)
     exit(-1) if !rc

lib/cangallo/cangafile.rb

@@ -7,7 +7,7 @@
 require 'fileutils'
 require 'yaml'
 
-module Cangallo
+class Cangallo
 
   class Cangafile
     attr_accessor :data

lib/cangallo/config.rb

@@ -2,7 +2,7 @@
 require 'fileutils'
 require 'yaml'
 
-module Cangallo
+class Cangallo
   class Config
     CONFIG_DIR = '.cangallo'
     CONFIG_FILE = 'config.yaml'
@@ -17,7 +17,7 @@ class Config
 
     def initialize
       create_config_dir
-      create_default_config  
+      create_default_config
       load_conf
     end
 

lib/cangallo/keybase.rb

@@ -1,7 +1,7 @@
 
 # vim:tabstop=2:sw=2:et:
 
-module Cangallo
+class Cangallo
 
   module Keybase
     def self.sign(file)

lib/cangallo/libguestfs.rb

@@ -6,7 +6,7 @@
 require 'tempfile'
 require 'fileutils'
 
-module Cangallo
+class Cangallo
 
   class LibGuestfs
     def self.virt_customize(image, commands)

lib/cangallo/qcow2.rb

@@ -6,7 +6,7 @@
 require 'tempfile'
 require 'fileutils'
 
-module Cangallo
+class Cangallo
 
   class Qcow2
     attr_reader :path

lib/cangallo/repo.rb

@@ -5,7 +5,7 @@
 
 # vim:ts=2:sw=2
 
-module Cangallo
+class Cangallo
 
   class Repo
     attr_reader :images, :tags, :path, :name