waggit 0.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzQ4MjkxMDJjOTE0M2IyMzZkYjQ5OWQ4NDVkNzQwYzVmODFjNWQxZg==
+  data.tar.gz: !binary |-
+    MDgzZmUyNjViY2JmOTRlMGNjZTlmODE1NTljOWQwMzQ2ZTNmN2UzZg==
+SHA512:
+  metadata.gz: !binary |-
+    OWY3MjE0YTA1ZWM3ZWFhYTNhMTUyNGQ2ZGRiNjQ2M2RlZTgwYjRhNmI2NTZh
+    MTNlZTlkYTg1ZmY3YWMzM2QzZTEwODhkOTNmYTNiMTZkYzRiZDhkMmMxZjc4
+    MzQyMzcxMGVjMjJmNDE2NjIwYTc3ZDVmZmU1YjI0MjlmNDYzNjc=
+  data.tar.gz: !binary |-
+    OGIxYTFmMWZmNGVlNDI3NWNjNzdhYWQ1NmE5MWJkZmU2YTU4Y2I5OTY4OGQ2
+    OTVhZjIzMmM0NmM0MTZjMzAzOGE2NjkzYzMyMDc4Y2Y1N2E0NWRjNDJmNmFh
+    YmI0MGUyNGQ0M2VjM2Q0MzVmZGMxZDhkN2IyNWI3OTMzZDI1MWQ=

data/bin/waggit

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'waggit.rb'
+
+cmd = ARGV[0].downcase
+
+for arg in ARGV
+  puts "arg: #{arg}"
+end
+
+options = []
+if ARGV.length > 1
+  options = ARGV[1..(ARGV.length-1)]
+end
+
+
+case cmd
+when "s", "sync"
+  Waggit.sync(options)
+when "f", "forcepush", "fp"
+  Waggit.forcepush(options)
+when "c", "clean"
+  Waggit.clean(options)
+else
+  puts "Invalid command!"
+end

data/lib/command.rb

@@ -0,0 +1,38 @@
+
+# Handles all direct interaction with Bash
+#
+class Command
+
+  # Runs a command and returns the output
+  #
+  def self.run(command)
+    return `#{command}`
+  end
+
+
+end
+
+
+#require 'shellwords'
+
+# Handles all direct interaction with Bash
+#
+#class Bash
+
+  # Execute a string as a bash command.
+  # Returns true for success,
+  # false for failure.
+  #
+  #def self.run(command)
+    #escaped_command = Shellwords.escape(command)
+    #return `#{command}`
+  #end
+
+  # Returns the exit code of the last command run.
+  # 0 for success,
+  # non-zero for failure and exit status.
+  #
+  #def self.exit_status()
+  #  return $?.exitstatus
+  #end
+#end

data/lib/files.rb

@@ -0,0 +1,30 @@
+# Helper class for manipulating file system
+#
+class Files
+
+  # If we have scss files that we edit, their compiled css equivalents need
+  # to be deleted in order for wagon to recompile the scss
+  #
+  def self.clean_css()
+    Dir.glob('**/*.css').each do|css_file|
+      puts "Found css file: #{css_file}"
+      scss_file = css_file + ".scss"
+      puts "Searching for scss file: #{scss_file }"
+      if File.file?(scss_file )
+        puts "SCSS file found"
+        File.delete(css_file)
+        if css_file.include? '/'
+          "/" + css_file
+        end
+        if File.file?(css_file)
+          puts "ERROR: CSS file not deleted!"
+        else
+          puts "CSS file deleted"
+        end
+      else
+        puts "SCSS not file found"
+      end
+    end
+  end
+
+end

data/lib/git.rb

@@ -0,0 +1,107 @@
+require 'command.rb'
+
+class Git
+
+  @@wagon = "wagon-branch"
+  @@local = "local-branch"
+  # Add all local changes to be committed.
+  #
+  def self.add_all()
+    Command.run("git add -A .")
+  end
+
+  # Git commit, will prompt user for commit message
+  #
+  def self.commit_prompt()
+    puts "Enter a git commit message:"
+    message = $stdin.gets.chomp
+    self.commit(message)
+  end
+
+  # Git commit using provided message
+  def self.commit(message)
+    Command.run("git commit -m '#{message}'")
+  end
+
+  # Git push
+  #
+  def self.push()
+    Command.run("git push")
+  end
+
+  # Git pull
+  #
+  def self.pull()
+    Command.run("git pull")
+  end
+
+  def self.checkout(branch)
+    Command.run("git checkout #{branch}")
+  end
+
+  def self.checkout_master()
+    self.checkout("master")
+  end
+
+  def self.checkout_new_wagon()
+    self.checkout("-b #{@@wagon}")
+  end
+
+  def self.checkout_new_local()
+    self.checkout("-b #{@@local}")
+  end
+
+  def self.delete_branch(branch)
+    Command.run("git branch -D #{branch}")
+  end
+
+  def self.delete_wagon()
+    self.delete_branch(@@wagon)
+  end
+
+  def self.delete_local()
+    self.delete_branch(@@local)
+  end
+
+  def self.stash()
+    Command.run("git stash")
+  end
+
+  def self.stash_pop()
+    Command.run("git stash pop")
+  end
+
+  def self.merge(branch)
+    Command.run("git merge #{branch}")
+  end
+
+  def self.merge_wagon()
+    self.merge(@@wagon)
+  end
+
+  def self.merge_local()
+    self.merge(@@local)
+  end
+
+  def self.rebase(from, to)
+    Command.run("git rebase #{} #{}")
+  end
+
+  def self.rebase_wagon()
+    self.rebase("master", @@wagon)
+  end
+
+  def self.rebase_local()
+    self.rebase("master", @@local)
+  end
+
+  def self.has_changes?()
+    return !!Command.run("git ls-files -m")
+  end
+
+  def self.clean_whitespace_changes()
+  # git stash && git stash apply && git diff -w > ws.patch && git checkout . && git apply --ignore-space-change --ignore-whitespace ws.patch && rm ws.patch
+    puts "This does nothin yet"
+  end
+
+end

data/lib/waggit.rb

@@ -0,0 +1,66 @@
+require 'git.rb'
+require 'wagon.rb'
+require 'files.rb'
+
+class Waggit
+
+  # Verifies that the current working directory is setup to work with both git and wagon
+  #
+  def self.test()
+    puts "test... doesn't work yet"
+  end
+
+  def self.clean(options)
+    Files.clean_css
+  end
+
+  def self.forcepush(options)
+    puts Git.add_all
+    puts Git.commit_prompt
+    puts Git.pull
+    puts Git.push
+    puts Wagon.push(options)
+  end
+
+  def self.sync(options)
+    puts Git.checkout_master
+    puts Git.delete_wagon
+    puts Git.delete_local
+    puts Git.stash
+
+    puts Git.checkout_new_wagon
+    puts Wagon.pull(options)
+    #TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
+    if Git.has_changes?
+      puts Git.add_all
+      puts Git.commit "merge wagon pull"
+    end
+
+    puts Git.checkout_master
+    puts Git.rebase_wagon
+    puts Git.checkout_master
+    puts Git.merge_wagon
+
+    puts Git.checkout_new_local
+    puts Git.stash_pop
+    puts Git.add_all
+    puts Git.commit_prompt
+    puts Git.rebase_local
+    puts Git.checkout_master
+    puts Git.merge_local
+    puts Git.delete_wagon
+    puts Git.delete_local
+
+    Files.clean_css
+    if Git.has_changes?
+      puts Git.add_all
+      puts Git.commit "cleaned css"
+    end
+
+    puts Git.pull
+    puts Git.push
+
+    puts Wagon.push(options)
+  end
+
+end

data/lib/wagon.rb

@@ -0,0 +1,35 @@
+require 'command.rb'
+
+class Wagon
+
+  # Converts the provided options into the appropriate
+  # string to append to the wagon command
+  #
+  def self.process_options(options)
+    resource_opts = []
+    for option in options
+      case option
+      when "-p"
+        resource_opts.push("pages")
+      when "-a"
+        resource_opts.push("theme_assets")
+      end
+    end
+    unless resource_opts.empty?
+      return " -r #{resource_opts.join(' ')}"
+    else
+      return ''
+    end
+
+
+  end
+
+  def self.pull(options)
+    Command.run("bundle exec wagon pull production#{self.process_options(options)}")
+  end
+
+  def self.push(options)
+    Command.run("bundle exec wagon push production#{self.process_options(options)}")
+  end
+
+end

metadata

@@ -0,0 +1,50 @@
+--- !ruby/object:Gem::Specification
+name: waggit
+version: !ruby/object:Gem::Version
+  version: 0.0.0
+platform: ruby
+authors:
+- Mere Agency
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-07-30 00:00:00.000000000 Z
+dependencies: []
+description: A way of integrating LocomotiveCMS/Wagon with git.
+email: support@mereagency
+executables:
+- waggit
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/waggit
+- lib/command.rb
+- lib/files.rb
+- lib/git.rb
+- lib/waggit.rb
+- lib/wagon.rb
+homepage: http://rubygems.org/gems/waggit
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: Wagon + Git = :)
+test_files: []