designshell 0.0.1

data/designshell.gemspec

@@ -0,0 +1,40 @@
+# Ensure we require the local version and not one we might have installed already
+require File.join([File.dirname(__FILE__),'lib','designshell','version.rb'])
+spec = Gem::Specification.new do |s| 
+  s.name = 'designshell'
+  s.version = DesignShell::VERSION
+  s.author = 'Gary McGhee'
+  s.email = 'contact@buzzware.com.au'
+  s.summary = 'DesignShell is the shell for designers'
+  s.description   = 'All-round workflow tool for designers. Enables designers to comfortably use geek goodness like git, git deploy, SASS etc'
+  s.require_paths = ["lib"]
+  s.homepage = 'http://github.com/buzzware/designshell'
+  s.platform = Gem::Platform::RUBY
+# Add your other files here if you make them
+  s.files         = `git ls-files`.split($\)
+  s.bindir = 'bin'
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  #s.has_rdoc = true
+  #s.extra_rdoc_files = ['README.rdoc','designshell.rdoc']
+  #s.rdoc_options << '--title' << 'designshell' << '--main' << 'README.rdoc' << '-ri'
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec-core')
+  s.add_development_dependency('rdoc')
+	s.add_development_dependency('aruba')
+	s.add_development_dependency('ruby-debug')
+  s.add_runtime_dependency('gli','2.5.0')
+	s.add_runtime_dependency('termios')
+	s.add_runtime_dependency('highline')
+	s.add_runtime_dependency('git')
+	s.add_runtime_dependency('middleman')
+	s.add_runtime_dependency('buzzcore')
+	s.add_runtime_dependency('POpen4')
+	s.add_runtime_dependency('bitbucket_rest_api')
+	s.add_runtime_dependency('osx_keychain')
+	s.add_runtime_dependency('json')
+	s.add_runtime_dependency('net_dav')
+	s.add_runtime_dependency('net-ssh')
+
+end

data/designshell.iml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.8.7-p358 [dash]" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="POpen4 (v0.1.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="Platform (v0.4.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="RubyInline (v3.12.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ZenTest (v4.8.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v3.2.11, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aruba (v0.5.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bitbucket_rest_api (v0.1.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.1.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="buzzcore (v0.6.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.6, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="chunky_png (v1.2.7, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.2.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.3.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="columnize (v0.3.6, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="compass (v0.12.2, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber (v1.2.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="execjs (v1.4.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.8.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday_middleware (v0.8.8, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.3.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fssm (v0.2.9, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.11.5, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="git (v1.2.5, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gli (v2.5.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="haml (v3.1.7, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hashie (v1.2.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="highline (v1.6.15, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hike (v1.2.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="http_router (v0.10.2, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.7.6, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="linecache (v0.46, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="listen (v0.5.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="maruku (v0.6.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="middleman (v3.0.9, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="middleman-core (v3.0.9, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="middleman-more (v3.0.9, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="middleman-sprockets (v3.0.6, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.5.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v1.1.5, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.6.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net_dav (v0.5.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.6, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="open4 (v1.3.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="osx_keychain (v1.0.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="padrino-core (v0.10.7, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="padrino-helpers (v0.10.7, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v1.4.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack-protection (v1.3.2, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.9.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.8.8, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rbx-require-relative (v0.0.9, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.12.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.12.2, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.12.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.12.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-debug (v0.10.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-debug-base (v0.10.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sass (v3.2.5, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simple_oauth (v0.2.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sinatra (v1.3.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sprockets (v2.4.5, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sprockets-sass (v0.9.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="syntax (v1.0.0, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="termios (v0.9.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thor (v0.15.4, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tilt (v1.3.3, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="uglifier (v1.2.7, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="url_mount (v0.2.1, RVM: ruby-1.8.7-p358 [dash]) [gem]" level="application" />
+  </component>
+</module>
+

data/designshell.rdoc

@@ -0,0 +1,5 @@
+= designshell
+
+Generate this with
+    ds rdoc
+After you have described your command line interface

data/features/designshell.feature

@@ -0,0 +1,8 @@
+Feature: My bootstrapped app kinda works
+  In order to get going on coding my awesome app
+  I want to have aruba and cucumber setup
+  So I don't have to do it myself
+
+  Scenario: App just runs
+    When I get help for "ds"
+    Then the exit status should be 0

data/features/step_definitions/designshell_steps.rb

@@ -0,0 +1,6 @@
+When /^I get help for "([^"]*)"$/ do |app_name|
+  @app_name = app_name
+  step %(I run `#{app_name} help`)
+end
+
+# Add more step definitions here

data/features/support/env.rb

@@ -0,0 +1,15 @@
+#require 'aruba/cucumber'
+#
+#ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+#LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
+#
+#Before do
+#  # Using "announce" causes massive warnings on 1.9.2
+#  @puts = true
+#  @original_rubylib = ENV['RUBYLIB']
+#  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+#end
+#
+#After do
+#  ENV['RUBYLIB'] = @original_rubylib
+#end

data/lib/buzzcore_mods.rb

@@ -0,0 +1,19 @@
+MiscUtils.module_eval do
+	# Like bite, but returns the first match instead of the subject
+	#if !self.instance_methods.include? "extract!"
+	#end
+	def self.ensure_slashes(aString,aLeading,aTrailing)
+		if (aLeading)
+			aString = ensure_prefix(aString,'/')
+		else
+			aString = aString.bite('/')
+		end
+		if (aTrailing)
+			aString = ensure_suffix(aString,'/')
+		else
+			aString = aString.chomp('/') unless aString=='/' && aLeading
+		end
+		aString
+	end
+
+end

data/lib/designshell/context.rb

@@ -0,0 +1,48 @@
+module DesignShell
+
+	class Context
+		attr_reader :global_options,:options,:pwd,:argv,:env,:stdout,:stdin,:stderr,:credentials,:key_chain
+		attr_writer :pwd
+
+		def initialize(aValues=nil)
+			return if !aValues
+			@global_options = aValues[:global_options]
+			@options = aValues[:options]
+			@pwd = MiscUtils.real_path(Dir.pwd)
+			@argv = aValues[:argv]
+			@env = aValues[:env]
+			@stdout = aValues[:stdout]
+			@stdin = aValues[:stdin]
+			@stderr = aValues[:stderr]
+			@credentials = aValues[:credentials]
+			@key_chain = aValues[:key_chain]
+		end
+
+		# http://thinkingdigitally.com/archive/capturing-output-from-puts-in-ruby/
+		#class SimpleSemParserTest < Test::Unit::TestCase
+		#  def test_set_stmt_write
+		#    out = capture_stdout do
+		#      parser = SimpleSemParser.new
+		#      parser.parse('set write, "Hello World!"').execute
+		#    end
+		#    assert_equal "Hello World!\n", out.string
+		#  end
+		#end
+		def capture_stdout
+			stdout_before = @stdout
+			out = StringIO.new
+      @stdout = out
+      yield
+      return out.string
+    ensure
+      @stdout = stdout_before
+    end
+
+		def find_git_root
+			git_folder = MiscUtils.find_upwards(@pwd,'.git')
+			return git_folder && git_folder.chomp('/.git')
+		end
+
+	end
+
+end

data/lib/designshell/core.rb

@@ -0,0 +1,78 @@
+module DesignShell
+	class Core
+
+		attr_reader :repo,:configured,:context
+
+		def initialize(aDependencies=nil)
+			@@instance = self unless (defined? @@instance) && @@instance
+			if aDependencies
+				@context = aDependencies[:context]
+				@repo = aDependencies[:repo]
+				@keyChain = aDependencies[:keyChain] || @context.key_chain
+			end
+			configure(@context) if @context
+		end
+
+		def self.instance
+			(defined? @@instance) && @@instance
+		end
+
+		def configure(aContext)
+			@configured = true
+		end
+
+		def ensure_repo_open
+			if (!@repo && @context)
+				if git_root = @context.find_git_root
+					@repo = DesignShell::Repo.new
+					@repo.open git_root
+				end
+			end
+			raise "unable to open repository" unless @repo.open?
+			@repo
+		end
+
+		def ensure_deploy_server
+			@conn ||= Net::SSH.start(@context.credentials[:deploy_host],nil)
+		end
+
+		def deploy_plan(*args)
+			return @deploy_plan if args.empty?
+			plan = args.first
+			if plan.is_a?(DesignShell::DeployPlan)
+				@deploy_plan = plan
+			elsif plan
+				@deploy_plan = DesignShell::DeployPlan.new(:core => self,:plan => plan)
+			end
+			@deploy_plan
+		end
+
+		def build
+			response = POpen4::shell('ls')
+			# puts result[:stdout]
+		end
+
+		def deploy
+			ensure_repo_open
+			deploy_branch = 'master'
+			deploy_plan(repo.get_file_content('.deploy_plan.xml',deploy_branch))
+			params = deploy_plan.deploy_items_values.clone
+			params['site'] = deploy_plan.site
+			params['repo_url'] = repo.origin.url
+			call_server_command('DEPLOY',params)
+		end
+
+		def call_server_command(aCommand, aParams=nil)
+			#ds_conn = ensure_deploy_server
+			command = aCommand
+			command += " " + JSON.generate(aParams) if aParams
+			#result = ds_conn.exec!(command)
+			result = nil
+			Net::SSH.start(@context.credentials[:deploy_host],nil) do |ssh|
+				result = ssh.exec!(command)
+			end
+			result
+		end
+
+	end
+end

data/lib/designshell/deploy_plan.rb

@@ -0,0 +1,40 @@
+module DesignShell
+	class DeployPlan
+		def initialize(aConfig=nil)
+			return if !aConfig
+			@core = aConfig[:core]
+			read(aConfig[:plan]) if aConfig[:plan]
+		end
+
+		def read(aDeployPlan)
+			@deployPlanNode = XmlUtils.get_xml_root(aDeployPlan)
+		end
+
+		def site
+			XmlUtils.peek_node_value(@deployPlanNode,'/deployPlan/@site')
+		end
+
+		def deploy_node()  # later accept criteria
+			XmlUtils.single_node(@deployPlanNode,'/deployPlan/plan/deploy')
+		end
+
+		def key_chain
+			@core && @core.context && @core.context.key_chain
+		end
+
+		def deploy_items_values(aDeployNode=nil)
+			aDeployNode ||= deploy_node()
+			result = {}
+			aDeployNode.get_elements('item').each do |n|
+				next unless name = XmlUtils.attr(n,'name')
+				if text = n.text.to_nil # value in node
+					result[name] = text
+				elsif key_chain                   # value in keyChain
+					key = XmlUtils.attr(n,'key') || name
+					result[name] = key_chain[key]
+				end
+			end
+			result
+		end
+	end
+end

data/lib/designshell/key_chain.rb

@@ -0,0 +1,40 @@
+module DesignShell
+	class KeyChain
+
+		def initialize(aNamespace)
+			@keychain = OSXKeychain.new
+			@namespace = aNamespace
+		end
+
+		def [](aKey)
+			get(aKey)
+		end
+
+		def []=(aKey,aValue)
+			set(aKey,aValue)
+		end
+
+		def set(aKey,aValue=nil,aPrefix='')
+			if (aKey.is_a?(String) || aKey.is_a?(Symbol))
+				@keychain[@namespace,aPrefix.to_s+aKey.to_s] = aValue
+			elsif aKey.is_a?(Hash)
+				prefix = aValue || aPrefix
+				aKey.each {|k,v| set(k,v,prefix)}
+			end
+		end
+
+		def get(aKey,aPrefix=nil,aKeepPrefix=false)
+			if (aKey.is_a?(Array))
+				result = {}
+				aKey.each do |k|
+					storeKey = (aKeepPrefix ? aPrefix.to_s+k.to_s : k.to_s)
+					v = get(k.to_s,aPrefix)
+					result[storeKey] = v
+				end
+				return result
+			else
+				return @keychain[@namespace,aPrefix.to_s+aKey.to_s]
+			end
+		end
+	end
+end

data/lib/designshell/repo.rb

@@ -0,0 +1,112 @@
+Git::Lib.class_eval do
+	public :command, :command_lines
+end
+
+module DesignShell
+	class Repo
+
+		attr_reader :git,:configured
+
+		GIT_METHODS = [:commit,:add,:reset_hard,:path,:clone,:log,:size,:branches,:status,:remotes,:pull,:fetch,:push,:merge]
+
+		def initialize(aDesignShell=nil)
+			@ds = aDesignShell
+		end
+
+		def method_missing(sym, *args, &block)
+			if @git && GIT_METHODS.include?(sym)
+				@git.send sym, *args, &block
+			else
+				super
+			end
+		end
+
+		#def configure(aContext=nil)
+		#	# set @path
+		#	@configured = true
+		#end
+
+		def open(aPath)
+			@git = Git.open(aPath, :log => Logger.new(STDOUT))
+		end
+
+		def init(*args)
+			@git = Git.init(*args)
+		end
+
+		def clone(aUrl,aPath)
+			@git = Git::clone(aUrl,aPath)
+		end
+
+		def open?
+			!!@git
+		end
+
+		def empty?
+			!@git.branches[0]
+		end
+
+		def commit_all(*args)
+			result = begin
+				@git.commit_all(*args)
+			rescue Git::GitExecuteError => e
+				if e.message.index("nothing to commit (working directory clean)")
+					nil
+				else
+					raise e
+				end
+			end
+			result = commitFromString(result)
+			result
+		end
+
+		# "[master (root-commit) 6bdd9e1] first commit  1 files changed, 1 insertions(+), 0 deletions(-)  create mode 100644 file1.txt"
+		def commitFromString(aString)
+			return nil if !aString || aString.empty?
+			sha = aString.scan(/ ([a-f0-9]+)\]/).flatten.first
+			@git.gcommit(sha)
+		end
+
+		def path
+			@git.dir.path
+		end
+
+		def origin
+			@git.remotes.find {|r| r.name=='origin'}
+		end
+
+		def url
+			(o = origin) && o.url
+		end
+
+		def checkout(commit=nil,branch=nil)
+			specific_commit = !!commit && !commit.index('HEAD')
+			if specific_commit
+				@git.checkout commit
+			else
+				branch ||= 'master'
+				@git.checkout(branch)
+			end
+		end
+
+		def branch
+			@git.current_branch
+		end
+
+		def head
+			@git.log.first
+		end
+
+		# git --no-pager diff --name-status 26bb87c3981 191d64820f2b
+		# result is array of paths prefixed with status letter then a tab
+		# see http://git-scm.com/docs/git-diff under --diff-filter=
+		# Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (i.e. regular file, symlink, submodule, ...) changed (T)
+		def changesBetweenCommits(aFromCommit, aToCommit)
+			@git.lib.command_lines('diff',['--name-status',aFromCommit,aToCommit])
+		end
+
+		def get_file_content(aPath,aCommitOrBranch=nil)
+			@git.lib.command('show',[[aCommitOrBranch||'master',aPath].join(':')]) rescue nil
+		end
+	end
+end

data/lib/designshell/repo_server.rb

@@ -0,0 +1,25 @@
+require 'bitbucket_rest_api'
+
+module DesignShell
+	class RepoServer
+
+		DELEGATE_METHODS = [:user,:oauth_token,:oauth_secret,:basic_auth,:login,:password,:adapter,:adapter=,:setup]
+
+		def initialize
+			@bitbucket = BitBucket::Client.new({})
+		end
+
+		def method_missing(sym, *args, &block)
+			if @bitbucket && DELEGATE_METHODS.include?(sym)
+				@bitbucket.send sym, *args, &block
+			else
+				super
+			end
+		end
+
+		def repos
+			@bitbucket.repos.all
+		end
+
+	end
+end

data/lib/designshell/site_client.rb

@@ -0,0 +1,141 @@
+module DesignShell
+
+	# might have to work on net_dav to support curl with put ie implement request_sending_body
+	# http://curb.rubyforge.org/classes/Curl/Easy.html
+	#
+
+	class SiteClient
+
+		attr_accessor :deploy_status_file
+
+		def initialize(aConfig)
+			#@context = aContext
+			@server_path = MiscUtils.remove_slash(aConfig[:site_url])
+			site_username = aConfig[:site_username]
+			site_password = aConfig[:site_password]
+
+			@dav = Net::DAV.new(MiscUtils.append_slash(@server_path), :curl => false)
+			@dav.verify_server = false
+			@dav.credentials(site_username,site_password)
+			@deploy_status_file = '/content/.deploy-status.txt'
+		end
+
+		DAV_METHODS = [:find]
+
+		def method_missing(sym, *args, &block)
+			if @dav && DAV_METHODS.include?(sym)
+				@dav.send sym, *args, &block
+			else
+				super
+			end
+		end
+
+		def full_path(aRelativePath)
+			File.join(@server_path, URI.escape(aRelativePath))
+		end
+
+		def ls(aPath=nil,aRecursive=false)
+			result = []
+			path = MiscUtils.append_slash(full_path(aPath||''))
+			@dav.find(path,:recursive=>aRecursive,:suppress_errors=>false) do | item |
+			  result << item.url.to_s.bite(path)
+			end
+			result
+		end
+
+		def list_files(aPath=nil,aRecursive=false)
+			result = ls(aPath,aRecursive)
+			result.delete_if {|f| f.ends_with? '/'}
+			result
+		end
+
+		def get_string(aPath)
+			begin
+				@dav.get(full_path(aPath))
+			rescue Net::HTTPServerException => e
+				e.response.is_a?(Net::HTTPNotFound) ? nil : raise
+			rescue Net::HTTPError => e
+				e.message.index('404') ? nil : raise
+			end
+		end
+
+		def put_string(aPath,aString)
+			@dav.put_string(full_path(aPath),aString)
+		end
+
+		def ensure_folder_path(aPath)
+			path_parts = aPath.bite('/').chomp('/').split('/')
+			last_part = path_parts.length-1
+			existing_part = nil
+			last_part.downto(0) do |i|
+				existing_part = i if !existing_part && exists?(path = '/'+path_parts[0..i].join('/'))
+			end
+			(existing_part ? existing_part+1 : 0).upto(last_part) do |i|
+				mkdir('/'+path_parts[0..i].join('/'))
+			end
+		end
+
+		def delete(aPath)
+			begin
+				@dav.delete(full_path(aPath))
+			rescue Net::HTTPServerException => e
+				e.response.is_a?(Net::HTTPNotFound) ? nil : raise
+			end
+		end
+
+		def deploy_status
+			s = get_string(deploy_status_file)
+			s ? JSON.parse(s) : nil
+		end
+
+		def deploy_status=(aObject)
+			if aObject
+				s = JSON.generate(aObject)
+				put_string(deploy_status_file,s)
+			else
+				delete deploy_status_file
+			end
+			aObject
+		end
+
+		def put_file(aLocalFile, aRemotePath, aEnsureFolder=true)
+			s = MiscUtils.string_from_file(aLocalFile)
+			ensure_folder_path(File.dirname(aRemotePath)) if aEnsureFolder
+			put_string(aRemotePath,s)
+		end
+
+		def get_file(aRemotePath, aLocalFile)
+			s = get_string(aRemotePath)
+			MiscUtils.string_to_file(s,aLocalFile)
+		end
+
+		def upload_files(aLocalDir,aFiles,aFromPath=nil,aToPath=nil)
+			aFiles.each do |f|
+				to = f
+				to = MiscUtils.path_rebase(to,aFromPath,aToPath) if aFromPath && aToPath
+				put_file(File.join(aLocalDir,f),to)
+			end
+		end
+
+		def delete_files(aPaths,aFromPath=nil,aToPath=nil)
+			if (aFromPath && aToPath)
+				aPaths.each do |p|
+					delete(MiscUtils.path_rebase(p,aFromPath,aToPath))
+				end
+			else
+				aPaths.each do |p|
+					delete(p)
+				end
+			end
+		end
+
+		def exists?(aPath)
+			@dav.exists? full_path(aPath)
+		end
+
+		def mkdir(aPath)
+			@dav.mkdir full_path(aPath)
+		end
+
+	end
+end