mortar 0.12.4 → 0.12.5

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  data.tar.gz: b900035bf87f38c4ae6aedd392ba03a69eec6b47
+  metadata.gz: dad652ba02dba009df5e9927b30c0950c2f391fb
+SHA512: 
+  data.tar.gz: 44286eb21da7ab55d4a99b67417004f171439b801aed8aab92591a855a41977171a756acd726d35f9f5ed67f3f89ec65900ec83801e1867c3605a1db5caa45ad
+  metadata.gz: 9d50341259fd7bbd754a32f9507b6e62d2e0a254010a71f56477fc0a3443d4aac8d21bda3cdff8b1853ae987c26c81f390a9bd3b0250510cb4a7ce5f441f028c

data/lib/mortar/git.rb

@@ -452,7 +452,7 @@ module Mortar
         remotes = {}
         git("remote -v").split("\n").each do |remote|
           name, url, method = remote.split(/\s/)
-          if url =~ /^git@([\w\d\.]+):#{git_organization}\/[a-zA-Z0-9]+_([\w\d-]+)\.git$$/ ||
+          if url =~ /^git@([\w\d\.]+):#{git_organization}\/[a-f0-9]{24}+_([\w\d-]+)\.git$$/ ||
             url =~ /^git@([\w\d\.]+):#{git_organization}\/([\w\d-]+)\.git$$/
             remotes[name] = $2
           end

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

data/spec/mortar/git_spec.rb

@@ -228,7 +228,14 @@ STASH
       end
 
       it "finds new style project name remote" do
-        with_git_initialized_project_with_remote_prefix("") do |p|
+        with_git_initialized_project_with_remote_prefix("", "myproject") do |p|
+          remotes = @git.remotes("mortarcode-dev")
+          remotes["mortar"].should == p.name
+        end
+      end
+
+      it "finds new style project name remote with underscore" do
+        with_git_initialized_project_with_remote_prefix("", "my_project") do |p|
           remotes = @git.remotes("mortarcode-dev")
           remotes["mortar"].should == p.name
         end

data/spec/spec_helper.rb

@@ -156,13 +156,17 @@ def with_no_git_directory(&block)
 end
 
 def with_blank_project(&block)
+  with_blank_project_with_name("myproject", &block)
+end
+
+def with_blank_project_with_name(name, &block)
   # setup a sandbox directory
   starting_dir = Dir.pwd
   sandbox = File.join(Dir.tmpdir, "mortar", Mortar::UUID.create_random.to_s)
   FileUtils.mkdir_p(sandbox)
   
   # setup project directory
-  project_name = "myproject"
+  project_name = name
   project_path = File.join(sandbox, project_name)
   FileUtils.mkdir_p(project_path)
   
@@ -201,7 +205,7 @@ def with_git_initialized_project(&block)
   with_git_initialized_project_with_remote_prefix(remote_prefix, &block)
 end
 
-def with_git_initialized_project_with_remote_prefix(remote_prefix, &block)
+def with_git_initialized_project_with_remote_prefix(remote_prefix, name="myproject", &block)
     # wrap block in a proc that does a commit
   commit_proc = Proc.new do |project|
     git = Mortar::Git::Git.new
@@ -215,7 +219,7 @@ def with_git_initialized_project_with_remote_prefix(remote_prefix, &block)
     block.call(project)
   end
   
-  with_blank_project(&commit_proc)
+  with_blank_project_with_name(name, &commit_proc)
 end
 
 def with_embedded_project(&block)

metadata

@@ -1,205 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.12.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.12.5
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: mortar-api-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mortar-api-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: netrc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: netrc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        version: "0.7"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+      - !ruby/object:Gem::Version 
+        version: "2.1"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.2
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+      - !ruby/object:Gem::Version 
+        version: "0.28"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: gem-release
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id009 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id009
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id009
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id009
+  type: :development
+  version_requirements: *id012
 description: Client library and command-line tool to interact with the Mortar service.
 email: support@mortardata.com
-executables:
+executables: 
 - mortar
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - bin/mortar
 - css/illustrate.css
@@ -325,26 +250,28 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
+
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id009
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
+