jbundler 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    jbundler (0.3.0)
+    jbundler (0.3.1)
       ruby-maven (= 3.0.4.0.29.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.1.3)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)

data/lib/commands/abstract_command.rb~

@@ -0,0 +1,113 @@
+require 'rubygems/local_remote_options'
+
+class Gem::AbstractCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+
+  def gemcutter_url
+    ENV['GEMCUTTER_URL'] || 'https://gemcutter.org'
+  end
+
+  def setup
+    use_proxy! if http_proxy
+    sign_in unless api_key
+  end
+
+  def sign_in
+    say "Enter your Gemcutter credentials. Don't have an account yet? Create one at http://gemcutter.org/sign_up"
+
+    email = ask("Email: ")
+    password = ask_for_password("Password: ")
+
+    response = make_request(:get, "api_key") do |request|
+      request.basic_auth email, password
+    end
+
+    case response
+    when Net::HTTPSuccess
+      self.api_key = response.body
+      say "Signed in. Your api key has been stored in ~/.gem/credentials"
+    else
+      say response.body
+      terminate_interaction
+    end
+  end
+
+  def credentials_path
+    File.join(Gem.user_home, '.gem', 'credentials')
+  end
+
+  def api_key
+    Gem.configuration.load_file(credentials_path)[:rubygems_api_key]
+  end
+
+  def api_key=(api_key)
+    config = Gem.configuration.load_file(credentials_path).merge(:rubygems_api_key => api_key)
+
+    dirname = File.dirname(credentials_path)
+    Dir.mkdir(dirname) unless File.exists?(dirname)
+
+    File.open(credentials_path, 'w') do |f|
+      f.write config.to_yaml
+    end
+
+    @rubygems_api_key = api_key
+  end
+
+  def make_request(method, path)
+    require 'net/http'
+    require 'net/https'
+
+    url = URI.parse("#{gemcutter_url}/api/v1/#{path}")
+
+    http = proxy_class.new(url.host, url.port)
+
+    if url.scheme == 'https'
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.use_ssl = true
+    end
+
+    request_method =
+      case method
+      when :get
+        proxy_class::Get
+      when :post
+        proxy_class::Post
+      when :put
+        proxy_class::Put
+      when :delete
+        proxy_class::Delete
+      else
+        raise ArgumentError
+      end
+
+    request = request_method.new(url.path)
+    request.add_field "User-Agent", "Gemcutter/0.2.0"
+
+    yield request if block_given?
+    http.request(request)
+  end
+
+  def use_proxy!
+    proxy_uri = http_proxy
+    @proxy_class = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+  end
+
+  def proxy_class
+    @proxy_class || Net::HTTP
+  end
+
+  # @return [URI, nil] the HTTP-proxy as a URI if set; +nil+ otherwise
+  def http_proxy
+    proxy = Gem.configuration[:http_proxy] || ENV['http_proxy'] || ENV['HTTP_PROXY']
+    return nil if proxy.nil? || proxy == :no_proxy
+    URI.parse(proxy)
+  end
+
+  def ask_for_password(message)
+    system "stty -echo"
+    password = ask(message)
+    system "stty echo"
+    ui.say("\n")
+    password
+  end
+end

data/lib/commands/install_with_jars.rb~

@@ -0,0 +1,22 @@
+require 'rubygems/commands/install_command'
+class Gem::Commands::InstallCommand
+
+  unless respond_to? :execute_without_jars
+    alias :execute_without_jars :execute
+    def execute
+      begin
+        execute_without_jars
+      rescue Gem::SystemExitException => e
+        if e.exit_code == 0
+          puts "DO SOMETHING HERE WITH JARS"
+        end
+        raise e
+      end
+    end
+    alias :_s_a_y_ :say
+    def say( arg )
+      puts arg.sub( /.*\ /, '')
+      _s_a_y_( arg )
+    end
+  end
+end

data/lib/commands/nexus.rb~

@@ -0,0 +1,38 @@
+class Gem::Commands::PushCommand < Gem::AbstractCommand
+
+  def description
+    'Push a gem up to Nexus server'
+  end
+
+  def arguments
+    "GEM       built gem to push up"
+  end
+
+  def usage
+    "#{program_name} GEM"
+  end
+
+  def initialize
+    super 'push', description
+    add_proxy_option
+  end
+
+  def execute
+    setup
+    send_gem
+  end
+
+  def send_gem
+    say "Pushing gem to Nexus..."
+
+    path = get_one_gem_name
+    response = make_request(:post, "gems") do |request|
+      request.body = Gem.read_binary(path)
+      request.add_field("Content-Length", request.body.size)
+      request.add_field("Content-Type", "application/octet-stream")
+      request.add_field("Authorization", api_key)
+    end
+
+    say response.body
+  end
+end

data/lib/commands/push.rb~

@@ -0,0 +1,38 @@
+class Gem::Commands::PushCommand < Gem::AbstractCommand
+
+  def description
+    'Push a gem up to Gemcutter'
+  end
+
+  def arguments
+    "GEM       built gem to push up"
+  end
+
+  def usage
+    "#{program_name} GEM"
+  end
+
+  def initialize
+    super 'push', description
+    add_proxy_option
+  end
+
+  def execute
+    setup
+    send_gem
+  end
+
+  def send_gem
+    say "Pushing gem to Gemcutter..."
+
+    path = get_one_gem_name
+    response = make_request(:post, "gems") do |request|
+      request.body = Gem.read_binary(path)
+      request.add_field("Content-Length", request.body.size)
+      request.add_field("Content-Type", "application/octet-stream")
+      request.add_field("Authorization", api_key)
+    end
+
+    say response.body
+  end
+end

data/lib/jars.rb~

@@ -0,0 +1,3 @@
+class Kernel
+
+end

data/lib/jbundler/aether.rb

@@ -85,11 +85,11 @@ module JBundler
       java_import 'jbundler.Aether'
     end
 
-    def initialize(config = Config.new)
+    def initialize(config = Config.new, offline = false)
       unless defined? Aether
         self.class.setup_classloader
       end
-      @aether = Aether.new(config.local_repository, config.verbose)
+      @aether = Aether.new(config.local_repository, config.verbose, offline)
     end
 
     def add_artifact(coordinate, extension = nil)

data/lib/rubygems_plugin.rb~

@@ -0,0 +1,6 @@
+require 'rubygems/command_manager'
+require 'commands/abstract_command'
+
+require "commands/nexus"
+Gem::CommandManager.instance.register_command :nexus
+

metadata

@@ -2,7 +2,7 @@
 name: jbundler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
   - Kristian Meier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-19 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: ruby-maven
@@ -61,41 +61,27 @@ extra_rdoc_files: []
 
 files: 
   - bin/jbundle
+  - lib/rubygems_plugin.rb~
   - lib/jbundler.rb
-  - lib/jbundler.rb~
+  - lib/jars.rb~
   - lib/jbundler.jar
-  - lib/jbundler/cli.rb~
-  - lib/jbundler/maven_gemify3.rb~
+  - lib/commands/install_with_jars.rb~
+  - lib/commands/abstract_command.rb~
+  - lib/commands/push.rb~
+  - lib/commands/nexus.rb~
   - lib/jbundler/pom.rb
-  - lib/jbundler/pom.rb~
-  - lib/jbundler/mavenfile.rb~
   - lib/jbundler/cli.rb
-  - lib/jbundler/lazy.rb~
-  - lib/jbundler/maven_version.rb~
   - lib/jbundler/config.rb
   - lib/jbundler/classpath_file.rb
   - lib/jbundler/aether.rb
-  - lib/jbundler/gemfile_lock.rb~
   - lib/jbundler/gemfile_lock.rb
-  - lib/jbundler/classpath_file.rb~
-  - lib/jbundler/config.rb~
-  - lib/jbundler/aether.rb~
   - lib/jbundler/lazy.rb
-  - lib/jbundler/maven_util.rb~
-  - lib/jbundler/maven.rb~
-  - spec/maven_util_spec.rb~
-  - spec/mavenfile_spec.rb~
-  - spec/pom_spec.rb~
-  - spec/classpath_file_spec.rb~
-  - spec/aether_spec.rb~
   - spec/classpath_file_spec.rb
   - spec/setup.rb
   - spec/pom_spec.rb
   - spec/aether_spec.rb
-  - spec/setup.rb~
   - MIT-LICENSE
   - Readme.md
-  - Test.md
   - Gemfile
   - Gemfile.lock
 homepage: https://github.com/mkristian/jbundler

data/lib/jbundler/aether.rb~

@@ -1,68 +0,0 @@
-require 'java'
-module JBundler
-
-  class AetherRuby
-
-    def self.setup_classloader
-      unless defined? Aether
-        @maven_home = File.dirname(File.dirname(Gem.bin_path('ruby-maven', 
-                                                             'rmvn')))
-        # TODO reduce to the libs which are really needed
-        Dir.glob(File.join(@maven_home, 'lib', "*jar")).each {|path| require path }
-        require 'jbundler.jar'
-        java_import 'jbundler.Aether'
-      end
-    end
-
-    def initialize(local_repo = File.join( ENV['HOME'], 
-                                           ".m2", 
-                                           "repository"), 
-                   verbose = false)
-      self.class.setup_classloader
-      @aether = AetherRuby.new(local_repo, verbose)
-    end
-
-    def add_artifact(coordinate, extension = nil)
-      if extension
-        coord = coordinate.split(/:/)
-        coord.insert(2, extension)
-        @aether.add_artifact(coordinate.join(":"))
-      else
-        @aether.add_artifact(coordinate)
-      end
-    end
-
-    def add_repository(url, name = "repo_#{repos.size}")
-      @aether.add_repository(name, url)
-    end
-
-    def install(coordinate)
-      @aether.install(coordinate)
-    end
-
-    def resolve
-      @aether.resolve
-    end
-
-    def classpath
-      @aether.classpath
-    end
-    
-    def dependency_map
-      @aether.dependency_map
-    end
-    
-    def repositories
-      @aether.repositories
-    end
-
-    def dependency_coordinates
-      @aether.dependency_coordinates
-    end
-
-    def install(coordinate, file)
-      @aether.install(coordinate, file)
-    end
-    
-  end
-end

data/lib/jbundler/classpath_file.rb~

@@ -1,207 +0,0 @@
-require 'uri'
-require 'tempfile'
-require 'fileutils'
-require 'set'
-require 'jbundler/gemfile_lock'
-require 'jbundler/pom'
-require 'java'
-
-# A modified maven_gemify2 taken from https://github.com/ANithian/bundler/blob/a29d4550dfb2f24372bf6e60f00e633ff92d5d64/lib/bundler/maven_gemify2.rb
-module JBundler
-
-  class Maven3NotFound < StandardError; end
-
-  class Maven
-    attr_reader :repositories
-
-    #repositories should be an array of urls
-    def initialize(*repositories)
-      maven                   # ensure maven initialized
-      @repositories = Set.new
-      if repositories.length > 0
-        @repositories.merge([repositories].flatten)
-      end
-      
-    end
-
-    def add_repository(repository_url)
-      @repositories << repository_url
-    end
-    
-    @@verbose = false
-    def self.verbose?
-      @@verbose || $DEBUG
-    end
-    def verbose?
-      self.class.verbose?
-    end
-    def self.verbose=(v)
-      @@verbose = v
-    end
-
-    private
-    def self.maven_config
-      @maven_config ||= Gem.configuration["maven"] || {}
-    end
-    def maven_config; self.class.maven_config; end
-
-    def self.java_imports
-      %w(
-           org.codehaus.plexus.classworlds.ClassWorld
-           org.codehaus.plexus.DefaultContainerConfiguration
-           org.codehaus.plexus.DefaultPlexusContainer
-           org.apache.maven.Maven
-           org.apache.maven.repository.RepositorySystem
-           org.apache.maven.execution.DefaultMavenExecutionRequest
-           org.apache.maven.artifact.repository.MavenArtifactRepository
-           org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout
-           org.apache.maven.artifact.repository.ArtifactRepositoryPolicy
-           javax.xml.stream.XMLStreamWriter
-           javax.xml.stream.XMLOutputFactory
-           javax.xml.stream.XMLStreamException
-          ).each {|i| java_import i }
-    end
-
-    def self.create_maven
-      bin = nil
-      if ENV['M2_HOME'] # use M2_HOME if set
-        bin = File.join(ENV['M2_HOME'], "bin")
-      else
-        ENV['PATH'].split(File::PATH_SEPARATOR).detect do |path|
-          mvn = File.join(path, "mvn")
-          if File.exists?(mvn)
-            if File.symlink?(mvn)
-              link = File.readlink(mvn)
-              if link =~ /^\// # is absolute path
-                bin = File.dirname(File.expand_path(link))
-              else # is relative path so join with dir of the maven command
-                bin = File.dirname(File.expand_path(File.join(File.dirname(mvn), link)))
-              end
-            else # is no link so just expand it
-              bin = File.expand_path(path)
-            end
-          else
-            nil
-          end
-        end
-      end
-      bin = "/usr/share/maven2/bin" if bin.nil? # OK let's try debian default
-      if File.exists?(bin)
-        @mvn = File.join(bin, "mvn")
-        if Dir.glob(File.join(bin, "..", "lib", "maven-core-3.*jar")).size == 0
-          begin
-            gem 'ruby-maven', ">=0"
-            bin = File.dirname(Gem.bin_path('ruby-maven', "rmvn"))
-            @mvn = File.join(bin, "rmvn")
-          rescue LoadError
-            bin = nil
-          end
-        end
-      else
-        bin = nil
-      end
-      raise Maven3NotFound.new("can not find maven3 installation. install ruby-maven with\n\n\tjruby -S gem install ruby-maven\n\n") if bin.nil?
-
-      warn "Using Maven install at #{bin}" if verbose?
-
-      boot = File.join(bin, "..", "boot")
-      lib = File.join(bin, "..", "lib")
-      ext = File.join(bin, "..", "ext")
-      (Dir.glob(lib + "/*jar")  + Dir.glob(boot + "/*jar")).each {|path| require path }
-
-      java.lang.System.setProperty("classworlds.conf", File.join(bin, "m2.conf"))
-      java.lang.System.setProperty("maven.home", File.join(bin, ".."))
-      java_imports
-
-      class_world = ClassWorld.new("plexus.core", java.lang.Thread.currentThread().getContextClassLoader());
-      config = DefaultContainerConfiguration.new
-      config.set_class_world class_world
-      config.set_name "ruby-tools"
-      container = DefaultPlexusContainer.new(config);
-      @@execution_request_populator = container.lookup(org.apache.maven.execution.MavenExecutionRequestPopulator.java_class)
-
-      @@settings_builder = container.lookup(org.apache.maven.settings.building.SettingsBuilder.java_class )
-      container.lookup(Maven.java_class)
-    end
-
-    def self.maven
-      @maven ||= create_maven
-    end
-    def maven; self.class.maven; end
-
-    def self.temp_dir
-      @temp_dir ||=
-        begin
-          d=Dir.mktmpdir
-          at_exit {FileUtils.rm_rf(d.dup)}
-          d
-        end
-    end
-    
-    def temp_dir
-      self.class.temp_dir
-    end
-
-    def execute(goals, pomFile, props = {})
-      request = DefaultMavenExecutionRequest.new
-      request.set_show_errors(true)
-
-      props.each do |k,v|
-        request.user_properties.put(k.to_s, v.to_s)
-      end
-      request.set_goals(goals)
-      request.set_logging_level 0
-      request.setPom(java.io.File.new(pomFile))
-      if verbose?
-        active_profiles = request.getActiveProfiles.collect{ |p| p.to_s }
-        puts "active profiles:\n\t[#{active_profiles.join(', ')}]"
-        puts "maven goals:"
-        request.goals.each { |g| puts "\t#{g}" }
-        puts "system properties:"
-        request.getUserProperties.map.each { |k,v| puts "\t#{k} => #{v}" }
-        puts
-      end
-      out = java.lang.System.out
-      string_io = java.io.ByteArrayOutputStream.new
-      java.lang.System.setOut(java.io.PrintStream.new(string_io))
-      result = maven.execute request
-      java.lang.System.out = out
-      has_exceptions = false
-      result.exceptions.each do |e|
-        has_exceptions = true
-        e.print_stack_trace
-        string_io.write(e.get_message.to_java_string.get_bytes)
-      end
-      raise string_io.to_s if has_exceptions
-      string_io.to_s
-    end
-    
-    public
-    
-    def generate_classpath(mavenfile = 'Mvnfile', classpathfile = '.jbundler/classpath.rb')
-
-      #to resolve deps and generate a classpath
-      pomfile=File.join(temp_dir,
-                        "pom.xml")
-      Pom.new(pomfile, "mavengemify", "1.0-SNAPSHOT",
-              File.read(mavenfile).split(/\n/) + GemfileLock.new.jar_deps)
-
-      execute(["dependency:resolve","dependency:build-classpath"],pomfile,{"mdep.outputFile" => "cp.txt","mdep.fileSeparator"=>"/"})
-      
-      FileUtils.mkdir_p(File.dirname(classpathfile))
-      File.open(classpathfile, 'w') do |f|
-        f.puts "JBUNDLER_CLASSPATH = []"
-        path_separator = java.lang.System.getProperty("path.separator").to_s
-        File.read(File.join(temp_dir,"cp.txt")).each do |line|
-          line.split(/#{path_separator}/).each do |path|
-            f.puts "JBUNDLER_CLASSPATH << '#{path}'" unless path =~ /pom$/
-          end
-        end
-        f.puts "JBUNDLER_CLASSPATH.freeze"
-        f.puts "JBUNDLER_CLASSPATH.each { |c| require c }"
-        f.close
-      end
-    end
-    
-  end
-end

data/lib/jbundler/cli.rb~

@@ -1,5 +0,0 @@
-class JBundler::Cli
-
-
-
-end