publicity 0.0.2 → 0.0.3

data/lib/publicity/prompt.rb

@@ -65,6 +65,7 @@ EOS
       # will get cleaned up after the begin block.
       tmpdir = Dir.mktmpdir(nil, '/tmp')
       begin
+        # Determine the credential helper we'll be using
         if @auth_type === 'basic'
           # If the user is using basic auth, we'll need to put their credentials
           # somewhere Git can access.
@@ -85,7 +86,7 @@ EOS
           dir = "#{tmpdir}/#{remote_repo[:name]}.git"
 
           # Clone the original repo
-          `git clone #{remote_repo.clone_url} #{dir} 1> /dev/null`
+          `git clone --bare #{remote_repo.clone_url} #{dir} 1> /dev/null`
 
           puts "Finished cloning."
 
@@ -93,11 +94,11 @@ EOS
           local_repo = Rugged::Repository.new(dir)
 
           # Get a list of all the branches, and filter out irrelevant branches
-          regex = /(#{Regexp.quote(@username)}|master)/
-          branches = Rugged::Branch.each_name(local_repo, :remote)
-                                   .sort
-                                   .select { |branch| branch =~ regex }
-                                   .each { |i| i.gsub!(/origin\//, '') }
+          branches = []
+          regex = /(#{Regexp.quote(@username)}|master|.*2013)/
+          Rugged::Branch.each(local_repo) do |branch|
+            branches.push(branch) if branch.name =~ regex
+          end
 
           # Ask the user which branch they want to keep; we'll end up deleting
           # all other branches. Skip over this prompt if the repo only has a
@@ -109,27 +110,25 @@ way, anyone who looks at your repository will see your code right away, rather
 than the repository's boilerplate code.
 
 EOS
-          if branches.include?('master') and branches.length === 1
-            branch_name = 'master'
-            puts "Only found branch `#{branch_name}`. Using that one."
+          if branches.any? { |b| b.name == 'master' } and branches.length === 1
+            branch = branches[0]
+            puts "Only found branch `#{branch.name}`. Using that one."
           else
-            puts "Here's a list of the branches you can keep:", ''
-            branches.each { |branch| puts branch }
-            puts ''
-
-            branch_name = ask("Please enter the name of the branch you'd like to keep: ") do |q|
-              # Validate that the string isn't just whitespace and that it's a
-              # valid branch name. First check is sort of redundant, but whatev.
-              q.validate = lambda { |p| p =~ /^(?!\s*$).+/ and branches.include?(p) }
-              q.responses[:not_valid] = "Sorry, that's an invalid branch name. Please enter the name of the branch you'd like to keep: "
+            branch = choose do |menu|
+              menu.index = :number
+              menu.select_by = :index
+              menu.prompt = "Please enter the number of the branch you'd like to keep: "
+              menu.choices(*branches.map { |item| item.name }) do |selection|
+                branches.detect { |b| b.name == selection }
+              end
             end
           end
 
           # Replace the master branch with the user's branch. This ensures that
           # anyone viewing the repo on GitHub is first presented with the user's
           # code, not some empty boilerplate project.
-          if not branch_name =~ /^master$/
-            Rugged::Branch.lookup(local_repo, branch_name)
+          if not branch.name =~ /^master$/
+            branch.move('master')
           end
 
           # Delete all remote branches
@@ -140,7 +139,7 @@ EOS
           end
 
           # Generate a readme and commit it to the repository.
-          create_readme!(local_repo, project)
+          create_readme!(local_repo, project, remote_repo[:name])
 
           # Rename the source repo on GitHub to make way for the (nicenamed) new
           # repository.
@@ -274,26 +273,29 @@ EOS
       result
     end
 
-    def create_readme!(repo, data)
+    def create_readme!(repo, data, remote_repo_name)
       text = <<EOS
-##{data[:name]}
+##{remote_repo_name}
 
 This is a copy of the work I did on a private repo, originally a project from
 the [Hack Reactor](http://hackreactor.com) curriculum. This project was worked
 on with a pair, and as such is representative of the kind of problems that I've
 tackled, but not of my solo work.
 
-For a better perspective on my own work, please see #{data[:name]}(#{data[:url]}).
+For a better perspective on my own work, please see [#{data[:name]}](#{data[:url]}).
 EOS
 
       oid = repo.write(text, :blob)
       index = repo.index
+      # Read the current tree into the index. This prevents us from overwriting
+      # the current index (and thus replacing the entire current tree)
+      index.read_tree(repo.lookup(repo.head.target).tree)
       index.add(:path => "README.md", :oid => oid, :mode => 0100644)
 
       author = { :email => "accounts@hackreactor.com", :name => 'Hack Reactor', :time => Time.now }
 
       Rugged::Commit.create(repo,
-        :tree       => repo.lookup(repo.index.write_tree),
+        :tree       => repo.lookup(index.write_tree),
         :author     => author,
         :committer  => author,
         :message    => "Add a readme (automated commit)",

data/lib/publicity/version.rb

@@ -1,3 +1,3 @@
 module Publicity
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publicity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler