mortar 0.8.2 → 0.8.3

data/lib/mortar/command/base.rb

@@ -164,7 +164,7 @@ class Mortar::Command::Base
     File.open(".mortar-project-remote", "w") do |f|
       f.puts api_registration_result["git_url"]
     end
-    git.sync_gitless_project(project)
+    git.sync_gitless_project(project, "master")
   end
   
 protected
@@ -400,13 +400,17 @@ protected
   def sync_code_with_cloud
     # returns git_ref
     if project.gitless_project?
-      return git.sync_gitless_project(project)
+      return git.sync_gitless_project(project, embedded_project_user_branch)
     else
       validate_git_based_project!
       return git.create_and_push_snapshot_branch(project)
     end
   end
 
+  def embedded_project_user_branch
+    return Mortar::Auth.user_s3_safe + "-base"
+  end
+
 end
 
 module Mortar::Command

data/lib/mortar/command/projects.rb

@@ -138,6 +138,9 @@ class Mortar::Command::Projects < Mortar::Command::Base
   # Adds a remote to your local git repository to the Mortar git repository.  For example if a 
   # co-worker creates a Mortar project from an internal repository you would clone the internal
   # repository and then after cloning call mortar projects:set_remote.
+  #
+  # --withoutgit    # make this a gitless project tied to the specified remote
+  #
   def set_remote
     project_name = shift_argument
 
@@ -145,13 +148,15 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:set_remote PROJECT\nMust specify PROJECT.")
     end
 
-    unless git.has_dot_git?
-      error("Can only set the remote for an existing git project.  Please run:\n\ngit init\ngit add .\ngit commit -a -m \"first commit\"\n\nto initialize your project in git.")
-    end
+    unless options[:withoutgit]
+      unless git.has_dot_git?
+        error("Can only set the remote for an existing git project.  Please run:\n\ngit init\ngit add .\ngit commit -a -m \"first commit\"\n\nto initialize your project in git.")
+      end
 
-    if git.remotes(git_organization).include?("mortar")
-      display("The remote has already been set for project: #{project_name}")
-      return
+      if git.remotes(git_organization).include?("mortar")
+        display("The remote has already been set for project: #{project_name}")
+        return
+      end
     end
 
     projects = api.get_projects().body["projects"]
@@ -160,7 +165,15 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("No project named: #{project_name} exists. You can create this project using:\n\n mortar projects:create")
     end
 
-    git.remote_add("mortar", project['git_url'])
+    if options[:withoutgit]
+      File.open(".mortar-project-remote", "w") do |f|
+        f.puts project["git_url"]
+      end
+      git.sync_gitless_project(project, embedded_project_user_branch)
+    else
+      git.remote_add("mortar", project["git_url"])
+    end
+
     display("Successfully added the mortar remote to the #{project_name} project")
 
   end

data/lib/mortar/git.rb

@@ -242,21 +242,23 @@ module Mortar
         "/tmp/mortar-git-mirrors"
       end
 
-      def sync_gitless_project(project)
+      def sync_gitless_project(project, branch)
         # the project is not a git repo, so we manage a mirror directory that is a git repo
+        # branch is which branch to sync to. this will be master if the cloud repo
+        # is being initialized, or a branch based on the user's name in any other circumstance
 
         project_dir = project.root_path
         mirror_dir = "#{mortar_mirrors_dir}/#{project.name}"
 
-        ensure_gitless_project_mirror_exists(project_dir, mirror_dir)
-        sync_gitless_project_with_mirror(project_dir, mirror_dir)
-        git_ref = sync_gitless_project_mirror_with_cloud(project_dir, mirror_dir)
+        ensure_gitless_project_mirror_exists(mirror_dir)
+        sync_gitless_project_with_mirror(mirror_dir, project_dir, branch)
+        git_ref = sync_gitless_project_mirror_with_cloud(mirror_dir, branch)
 
         Dir.chdir(project_dir)
         return git_ref
       end
 
-      def ensure_gitless_project_mirror_exists(project_dir, mirror_dir)
+      def ensure_gitless_project_mirror_exists(mirror_dir)
         # create and initialize mirror git repo if it doesn't already exist
         unless File.directory? mirror_dir
           unless File.directory? mortar_mirrors_dir
@@ -267,21 +269,35 @@ module Mortar
           remote_path = File.open(".mortar-project-remote").read.strip
           clone(remote_path, mirror_dir)
 
-          # make an initial commit to master
+          # make an initial commit to the specified branch
           Dir.chdir(mirror_dir)
-          File.open(".gitkeep", "w").close()
-          git("add .")
-          git("commit -m \"mortar development initial commit\"")
-          git("remote add mortar #{remote_path}")
-          push_with_retry("mortar", "master", "Setting up gitless Mortar project")
+          unless File.exists? ".gitkeep" # flag that signals that the repo has been initialized
+                                         # initialization is not necessary if this is not the first user to use it 
+            File.open(".gitkeep", "w").close()
+            git("add .")
+            git("commit -m \"Setting up gitless Mortar project\"")
+            git("remote add mortar #{remote_path}")
+            push_with_retry("mortar", "master", "Setting up gitless Mortar project")
+          end
         end
       end
 
-      def sync_gitless_project_with_mirror(project_dir, mirror_dir)
-        # pull from master and overwrite everything
+      def sync_gitless_project_with_mirror(mirror_dir, project_dir, branch)
+        # pull from remote branch and overwrite everything, if it exists.
+        # if it doesn't exist, create it.
         Dir.chdir(mirror_dir)
+        git("reset --hard HEAD")
         git("fetch --all")
-        git("reset --hard mortar/master")
+        begin
+          git("checkout #{branch}")
+        rescue Exception => e
+          err_msg = e.to_s
+          if err_msg.include?("error: pathspec") and err_msg.include?("did not match any file(s) known to git")
+            git("checkout -b #{branch}")
+          else
+            raise e
+          end
+        end
 
         # wipe mirror dir and copy project files into it
         # since we fetched mortar/master earlier, the git diff will now be b/tw master and the current state
@@ -290,7 +306,7 @@ module Mortar
         Dir.chdir(project_dir)
         FileUtils.cp_r(mortar_manifest_pathlist(false), mirror_dir)
 
-        # update master
+        # update remote branch
         Dir.chdir(mirror_dir)
         unless is_clean_working_directory?
           git("add .")
@@ -299,17 +315,17 @@ module Mortar
         end
       end
 
-      def sync_gitless_project_mirror_with_cloud(project_dir, mirror_dir)
+      def sync_gitless_project_mirror_with_cloud(mirror_dir, branch)
         # checkout snapshot branch.
-        # it will permenantly keep the code in this state (as opposed to master, which will be updated)
+        # it will permenantly keep the code in this state (as opposed to the user's base branch, which will be updated)
         Dir.chdir(mirror_dir)
         snapshot_branch = "mortar-snapshot-#{Mortar::UUID.create_random.to_s}"
         git("checkout -b #{snapshot_branch}")
 
-        # push everything (master updates and snapshot branch)
+        # push everything (use base branch updates and snapshot branch)
         git_ref = push_with_retry("mortar", snapshot_branch, "Sending code snapshot to Mortar", true)
 
-        git("checkout master")
+        git("checkout #{branch}")
         return git_ref
       end
 

data/lib/mortar/version.rb

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

data/spec/mortar/git_spec.rb

@@ -316,7 +316,7 @@ STASH
           mock(@git).push_with_retry.with_any_args.times(2) { true }
           mock(@git).is_clean_working_directory? { false }
 
-          @git.sync_gitless_project(p)
+          @git.sync_gitless_project(p, "master")
 
           File.directory?(mirror_dir).should be_true
           FileUtils.rm_rf(mirror_dir)
@@ -337,7 +337,7 @@ STASH
           mock(@git).push_with_retry.with_any_args.times(1) { true }
           mock(@git).is_clean_working_directory? { false }
 
-          @git.sync_gitless_project(p)
+          @git.sync_gitless_project(p, "bob-the-builder-base")
 
           File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_true
           FileUtils.rm_rf(mirror_dir)
@@ -359,7 +359,7 @@ STASH
           mock(@git).push_with_retry.with_any_args.times(1) { true }
           mock(@git).is_clean_working_directory? { false }
 
-          @git.sync_gitless_project(p)
+          @git.sync_gitless_project(p, "bob-the-builder-base")
 
           File.exists?("#{project_mirror_dir}/pigscripts/calydonian_boar.pig").should be_false
           FileUtils.rm_rf(mirror_dir)

metadata

@@ -1,164 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.8.3
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 2
-  version: 0.8.2
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mortar-api-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: netrc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !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'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 15
-        version: "0.15"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !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: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -249,38 +252,26 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-