adva-static 0.0.7 → 0.0.8

data/lib/adva/static/import/model/site.rb

@@ -1,5 +1,3 @@
-require 'site'
-
 module Adva
   class Static
     class Import

data/lib/adva/static/setup.rb

@@ -13,7 +13,7 @@ module Adva
         @remote = options[:remote]
         @host   = options[:host]  || 'example.org'
         @title  = options[:title] || host
-        
+
         Adva.out = StringIO.new('')
       end
 
@@ -35,34 +35,55 @@ module Adva
         Import.new(:source => source).run
         Export.new(app, :target => target).run
       end
-      
+
       def setup_source_repository
         root.join('.gitignore').rmtree rescue Errno::ENOENT
         root.join('.git').rmtree rescue Errno::ENOENT
-        
+
         File.open(root.join('.gitignore'), 'w+') { |f| f.write('export') }
-        
+
         Dir.chdir(root) do
-          `git init`
-          `git add .`
-          `git commit -am '#{host} source'`
-          `git branch source`
-          `git checkout --quiet source`
-          `git branch -D master`
-          `git remote add origin #{remote} -t source` if remote
+          init_repository
+          commit("#{host} source")
+          checkout_branch('source')
+          delete_branch('master')
+          add_remote('source') if remote
         end
       end
-      
+
       def setup_export_repository
         root.join('export/.git').rmtree rescue Errno::ENOENT
 
         Dir.chdir(target) do
+          init_repository
+          commit("#{host} export")
+          add_remote('master') if remote
+        end
+      end
+
+      protected
+
+        def init_repository
           `git init`
+        end
+
+        def commit(message)
           `git add .`
-          `git commit -am '#{host} export'`
-          `git remote add origin #{remote} -t master` if remote
+          `git commit -am '#{message}'`
+        end
+
+        def checkout_branch(name)
+          `git branch #{name}`
+          `git checkout --quiet #{name}`
+        end
+
+        def delete_branch(name)
+          `git branch -D #{name}`
+        end
+
+        def add_remote(branch)
+          `git remote add origin #{remote} -t #{branch}`
         end
-      end
     end
   end
-end
+end

data/lib/adva_static/version.rb

@@ -1,3 +1,3 @@
 module AdvaStatic
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-static
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Static engine for adva-cms2