six-rsync 0.6.6 → 0.6.7

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-rsync'
-  s.version = '0.6.6'
+  s.version = '0.6.7'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/rsync/base.rb

@@ -37,6 +37,25 @@ module Six
           self.new(opts)
         end
 
+        def self.convert(working_dir, opts = {})
+          opts = {
+            :working_directory => working_dir,
+            :repository => File.join(working_dir, '.rsync')
+          }.merge(opts)
+
+          #FileUtils.mkdir_p(opts[:working_directory]) if opts[:working_directory] && !File.directory?(opts[:working_directory])
+
+          # run rsync_convert there
+          logger = if opts[:log]
+            opts[:log]
+          else
+            nil
+          end
+          Rsync::Lib.new(opts, logger).convert
+
+          self.new(opts)
+        end
+
         # clones a rsync repository locally
         #
         #  repository - http://repo.or.cz/w/sinatra.git

data/lib/six/rsync/lib.rb

@@ -97,19 +97,25 @@ module Six
               @logger.info "Removed: #{key}"
             end
           end
+        end
 
+        def convert
+          init({:force => true})
+          bla(".")
         end
 
-        def init
+        def init(opts = {})
           @logger.info "Processing: #{rsync_path}"
           if File.exists? rsync_path
             @logger.error "Seems to already be an Rsync repository, Aborting!"
             raise RsyncError
           end
-          if File.exists? @rsync_work_dir
-            unless Dir[File.join(@rsync_work_dir, '*')].empty?
-              @logger.error "Folder not empty, Aborting!"
-              raise RsyncError
+          unless opts[:force]
+            if File.exists? @rsync_work_dir
+              unless Dir[File.join(@rsync_work_dir, '*')].empty?
+                @logger.error "Folder not empty, Aborting!"
+                raise RsyncError
+              end
             end
           end
           FileUtils.mkdir_p pack_path
@@ -133,6 +139,9 @@ module Six
         def add(file)
           @logger.error "Please use commit instead!"
           return
+        end
+
+        def bla(file)
           @logger.info "Adding #{file}"
           if (file == ".")
             load_repos(:remote)
@@ -151,13 +160,20 @@ module Six
                   change = true
                   @logger.info "Packing #{i + 1}/#{ar.size}: #{file}"
                   gzip(file)
+                  FileUtils.mkdir_p(File.dirname(pack_path(relative))) unless File.exists?(File.dirname(pack_path(relative)))
+                  checksum2 = md5("#{file}.gz")
                   @repos_remote[:wd][relative] = checksum
-                  @repos_remote[:pack]["#{relative}.gz"] = md5("#{file}.gz")
+                  @repos_remote[:pack]["#{relative}.gz"] = checksum2
+                  @repos_local[:wd][relative] = checksum
+                  @repos_local[:pack]["#{relative}.gz"] = checksum2
                   FileUtils.mv("#{file}.gz", pack_path("#{relative}.gz"))
                 end
               end
             end
-            save_repos if change
+            if change
+              save_repos
+              save_repos(:remote)
+            end
           else
 
           end

data/lib/six/rsync/options.rb

@@ -36,6 +36,10 @@ module Six
             todo << :commit if bool
           end
 
+          opts.on("-n", "--convert", "Converts into repository") do |bool|
+            todo << :convert if bool
+          end
+
           opts.on("--clone S", String, "Clones a Repository") do |s|
             todo << :clone
             @@host = s

data/lib/six/rsync-app.rb

@@ -72,6 +72,14 @@ module Six
 #          end
           Six::Repositories::Rsync.init(folder, :log => Six::Repositories::Rsync.logger)
         end
+
+        def self.convert(folder)
+#          if File.exists?(folder)
+#            logger.error "#{folder} already exists!"
+#            Process.exit
+#          end
+          Six::Repositories::Rsync.convert(folder, :log => Six::Repositories::Rsync.logger)
+        end
       end
 
       unless defined?(Ocra)

data/lib/six/rsync.rb

@@ -27,7 +27,7 @@ module Six
 
     module Rsync
       COMPONENT = 'six-rsync'
-      VERSION = '0.6.6'
+      VERSION = '0.6.7'
       BASE_PATH = Dir.pwd      
 
       case RUBY_PLATFORM
@@ -86,6 +86,11 @@ module Six
         Base.open(working_dir, options)
       end
 
+      # Converts into repository
+      def self.convert(working_dir = '.', options = {})
+        Base.convert(working_dir, options)
+      end
+
       # initialize a new rsync repository, defaults to the current working directory
       #
       # options

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Sickboy