rugs 0.1.0 → 0.1.1

data/LICENCE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Mike Bethany
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -8,7 +8,11 @@ RUGS has three main functions:
 * Sets up a remote repository to mirror your local one.
 * Adds a framework of git hooks allowing you to store and run your own hooks in directly from the repo.
 
-RUGS makes creating remote repos as simple as `rugs create repo_name on server_name`.
+RUGS makes creating remote repos as simple as `rugs create repo_name on server_name`. A local and remote repo will be created and your default remotes will automatically to the local repo.
+
+[This is to-do functionality so the "instructions" are just brainstorming]
+If you want to create just a local repo but add a remote as origin you would do this:  
+`rugs create repo_name on server_name using remote as origin`
 
 RUGS even allows you to automatically embed your Git hooks in the repo itself. No more jumping through hoops to make sure your hooks are maintained with your project; with RUGS you just store your hook scripts in the `git_hooks` directory and they're automatically updated and run.  
 
@@ -19,28 +23,35 @@ Once you've set up your project using RUGS you just use Git as you normally woul
 **Alpha**  
 Basic functionality done:
 
-* Stores config info for remotes
-* Sets up local repos
-* Sets up remote repos
-* Automatically adds default remotes to repos
+* Stores config info for remotes.
+* Sets up local repos.
+* Sets up remote repos.
+* Automatically adds default remotes to repos.
 
-## To do
+## To-do
 
-Lots...
+Lots:
 
-* Add setup templates
+* Add setup templates.
 * Add hook framework to store and run hooks from the repo itself.
+* Deal with existing repos.
+* Figure out how to set remotes in a repo as some name other than the remote's name.
+
+Non-functionality stuff:
 
+* Refactor (of course).
+* Clean up test, they're really ugly.
 
 ## Instructions
 
 * Install the gem.
 * Add a remote repo.
-* Create a new project
+* Create a new project.
 
 It might look something like this:
 
 	gem install rugs
 	
     rugs remote_add origin git@git-server:/srv/repos/git
-    rugs create new_project on origin
+    rugs create new_project on origin
+

data/bin/rugs

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
+require 'commandable'
+Commandable.verbose_parameters = false
+Commandable.color_output = true
+Commandable.app_exe = "rugs"
+Commandable.app_info =
+"""
+  RUGS - RUby Git Setup
+  A helper script that makes setting up remote git repositories a snap.
+  Copyright (c) 2012 Mike Bethany
+  http://mikbe.tk
+"""
+
+require 'rugs'
+Commandable.execute(ARGV)

data/lib/rugs/client.rb

@@ -1,30 +1,48 @@
+require 'commandable'
+
 module RUGS
 
   class Client
-  
-    def remote_list
-      @remote_list ||= Config.load("remotes")
+    extend Commandable
+    
+    command 'stored remotes'
+    def remotes
+      remote_list.collect do |remote, keys|
+        url     = keys[:url]
+        path    = keys[:path]
+        default =  keys[:default]
+        "#{remote}: #{url}#{":#{path}" if path}; default? #{default}"
+      end.insert(0, "All remotes:")
     end
- 
-    def default_remotes
-      @default_remotes ||= remote_list.select do |remote, keys|
-        keys[:default]
-      end
+    
+    command 'remotes that will automatically be added to repos'
+    def defaults
+      default_remotes.collect do |remote, keys|
+        url     = keys[:url]
+        path    = keys[:path]
+        default =  keys[:default]
+        "#{remote}: #{url}#{":#{path}" if path}; default? #{default}"
+      end.insert(0, "Default remotes:")
     end
     
+    command 'make and set up a remote'
     def create(repo_name, *remote)
-      
+      just_name = repo_name.split("/").last
+
       make_local_repo(repo_name)
       add_defaults(repo_name)
       make_hooks(repo_name)
       
+      FileUtils.cd repo_name
+
       unless remote.empty?
-        just_name = repo_name.split("/").last
         make_remote_repo(just_name, remote.last)
+        
       end
-      
+      "Created #{just_name} locally#{" and on remote #{remote.last}" unless remote.empty?}"
     end
     
+    command 'add a remote server to be used when setting up repos'
     def remote_add(remote, url_path, default=false)
       url, path = url_path.split(":")
       
@@ -32,19 +50,44 @@ module RUGS
       
       remote_list.merge!(remote => {url: url, path: path, default: default})
       Config.save("remotes", remote_list)
+      
+      puts "Added remote #{remote}."
+      remotes
     end
 
+    command 'remove a remote server from the list of remotes'
     def remote_remove(remote)
       remote_list.delete(remote)
       Config.save("remotes", remote_list)
+      
+      puts "Removed remote #{remote}."
+      remotes
     end
 
-    def default(remote, is_default=true)
+    command 'make an existing remote a default remote'
+    def set_default(remote, is_default=true)
       remote_list[remote][:default] = is_default
+      if is_default
+        "Set #{remote} as a default"
+      else
+        "Removed #{remote} from defaults"
+      end
+      remotes
+    end
+
+    command 'remove a remote from the default list'
+    def unset_default(remote)
+      set_default remote, false
+    end
+
+    def default_remotes
+      @default_remotes ||= remote_list.select do |remote, keys|
+        keys[:default]
+      end
     end
 
-    def undefault(remote)
-      default remote, false
+    def remote_list
+      @remote_list ||= Config.load("remotes")
     end
 
     private
@@ -64,7 +107,15 @@ module RUGS
 
     def add_defaults(repo_name)
       default_remotes.each do |remote, keys|
-        Git.remote_add(repo_name, remote, keys[:url])
+        url       = keys[:url]
+        path      = keys[:path]
+        just_name = repo_name.split("/").last
+        
+        Git.remote_add(
+          repo_name, 
+          remote, 
+          "#{url}:#{"#{path}/" if path}#{just_name}.git"
+        )
       end
     end
 

data/lib/rugs/config.rb

@@ -1,10 +1,10 @@
 require 'psych'
+require 'fileutils'
 
 module RUGS
   
   class Config
     
-    
     def self.load(name)
       return {} unless File.exist?(config_file(name))
       Psych.load(File.open(config_file(name)))
@@ -28,9 +28,11 @@ module RUGS
 
     public 
     
-    PATH = build_path(File.dirname(__FILE__), "../../config")
+    PATH = build_path("~/.rugs", "config")
     #File.expand_path(File.join(File.dirname(__FILE__), "/../config"))
 
+    FileUtils.mkdir_p PATH
+    
   end 
 
 end

data/lib/rugs/version.rb

@@ -1,3 +1,3 @@
 module RUGS
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/rugs.gemspec

@@ -11,13 +11,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{A helper script that makes setting up remote git repositories a snap.}
   s.description = 
 """
-== RUGS - RUby Git Setup
+= RUGS - RUby Git Setup
 
 A helper script that makes setting up remote git repositories a snap.  
 
+== WARNING: This is still alpha so use it at your own risk!
+Note: I don't use alpha/beta in the version numbers until I have a first real release because of how Ruby Gems handles them.
+
+== What is it?
+
 RUGS has three main functions:  
 
-* Creates a local git repository using default templates or ones you create.
+* Creates a local git repository and directory structure using default templates or ones you create.
 * Sets up a remote repository to mirror your local one.
 * Adds a framework of git hooks allowing you to store and run your own hooks in directly from the repo.
 
@@ -26,16 +31,17 @@ RUGS makes creating remote repos as simple as `rugs create repo_name on server_n
 RUGS even allows you to automatically embed your Git hooks in the repo itself. No more jumping through hoops to make sure your hooks are maintained with your project; with RUGS you just store your hook scripts in the `git_hooks` directory and they're automatically updated and run.  
 
 Once you've set up your project using RUGS you just use Git as you normally would with the exception of your hooks being the in `git_hooks` directory.  
-  
+
 """
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib","config"]
 
   s.add_development_dependency "rspec"
   
-  # s.add_runtime_dependency "rest-client"
-
+  s.add_runtime_dependency "commandable"
+  s.add_runtime_dependency "term-ansicolor-hi"
+  
 end

data/spec/rugs/client_spec.rb

@@ -2,23 +2,23 @@ require 'spec_helper'
 require 'psych'
 
 describe RUGS::Client do
-  
+
   let(:client) {RUGS::Client.new}
 
   let(:remote){'test'}
   let(:url){'root@git-test'}
   let(:path){'/srv/repos/git'}
-  
+
   let(:repo_name){random_name}
   let(:local_repo){"#{TEMP_DIR}/#{repo_name}"}
-  
+
   let(:test_hash){
     {"test"=>{:url=>url, path: nil, :default=>true}}
   }
   let(:another_hash){
     {"another"=>{:url=>"git@another_server.org", path: nil, :default=>true}}
   }
-  
+
   context 'when managing remote server settings' do
 
     context "and adding or removing servers" do
@@ -61,13 +61,13 @@ describe RUGS::Client do
 
       it "should set an exisiting remote as a default" do
         client.remote_add(remote, url)
-        client.default(remote)
+        client.set_default(remote)
         client.default_remotes.should include(remote)
       end
     
       it "should un-default a remote" do
         client.remote_add(remote, url, "default")
-        client.undefault(remote)
+        client.unset_default(remote)
         client.default_remotes.should_not include(remote)
       end
     
@@ -88,7 +88,7 @@ describe RUGS::Client do
     end
     
   end
-  
+
   context 'when creating local repos' do
 
     it 'should create a local git repo' do
@@ -114,6 +114,22 @@ describe RUGS::Client do
       remotes.should be_empty
     end
 
+    it "should build the remote path" do
+      client.remote_add(remote, url, "default")
+      client.create local_repo
+
+      remotes = `git --git-dir="#{local_repo}/.git" --work-tree="#{local_repo}" remote -v`
+      remotes.should include("#{url}:#{repo_name}.git")
+    end
+
+    it "should build the remote path with a path" do
+      client.remote_add(remote, "#{url}:#{path}", "default")
+      client.create local_repo
+
+      remotes = `git --git-dir="#{local_repo}/.git" --work-tree="#{local_repo}" remote -v`
+      remotes.should include("#{url}:#{path}/#{repo_name}.git")
+    end
+
   end
 
   # It's probably best to set up a git server on a virtual machine for these tests.
@@ -151,7 +167,7 @@ describe RUGS::Client do
     # end
 
   end
-  
+
   after(:each) do
     clean_config
     clean_temp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152208160 !ruby/object:Gem::Requirement
+  requirement: &2151814960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,59 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152208160
-description: ! "\n== RUGS - RUby Git Setup\n\nA helper script that makes setting up
-  remote git repositories a snap.  \n\nRUGS has three main functions:  \n\n* Creates
-  a local git repository using default templates or ones you create.\n* Sets up a
-  remote repository to mirror your local one.\n* Adds a framework of git hooks allowing
-  you to store and run your own hooks in directly from the repo.\n\nRUGS makes creating
-  remote repos as simple as `rugs create repo_name on server_name`.\n\nRUGS even allows
-  you to automatically embed your Git hooks in the repo itself. No more jumping through
-  hoops to make sure your hooks are maintained with your project; with RUGS you just
-  store your hook scripts in the `git_hooks` directory and they're automatically updated
-  and run.  \n\nOnce you've set up your project using RUGS you just use Git as you
-  normally would with the exception of your hooks being the in `git_hooks` directory.
-  \ \n  \n"
+  version_requirements: *2151814960
+- !ruby/object:Gem::Dependency
+  name: commandable
+  requirement: &2151813620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2151813620
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor-hi
+  requirement: &2151813040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2151813040
+description: ! "\n= RUGS - RUby Git Setup\n\nA helper script that makes setting up
+  remote git repositories a snap.  \n\n== WARNING: This is still alpha so use it at
+  your own risk!\nNote: I don't use alpha/beta in the version numbers until I have
+  a first real release because of how Ruby Gems handles them.\n\n== What is it?\n\nRUGS
+  has three main functions:  \n\n* Creates a local git repository and directory structure
+  using default templates or ones you create.\n* Sets up a remote repository to mirror
+  your local one.\n* Adds a framework of git hooks allowing you to store and run your
+  own hooks in directly from the repo.\n\nRUGS makes creating remote repos as simple
+  as `rugs create repo_name on server_name`.\n\nRUGS even allows you to automatically
+  embed your Git hooks in the repo itself. No more jumping through hoops to make sure
+  your hooks are maintained with your project; with RUGS you just store your hook
+  scripts in the `git_hooks` directory and they're automatically updated and run.
+  \ \n\nOnce you've set up your project using RUGS you just use Git as you normally
+  would with the exception of your hooks being the in `git_hooks` directory.  \n\n"
 email:
 - mikbe.tk@gmail.com
-executables: []
+executables:
+- rugs
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENCE
 - README.markdown
 - Rakefile
 - _spike/psych.rb
 - _spike/test.yaml
 - autotest/discover.rb
+- bin/rugs
 - lib/rugs.rb
 - lib/rugs/client.rb
 - lib/rugs/config.rb
@@ -64,6 +91,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- config
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements: