merged commits for elasticsearch-upgrade

metacpan · Mar 16, 2015 · 0596788 · 0596788
1 parent be4d4d8
commit 0596788
Show file tree

Hide file tree

Showing 22 changed files with 658 additions and 485 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,10 +28,9 @@ env:
 
 
 before_install:
-  # We need to run a pre-1.0 instance of ES until we update everything.
-  - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.13.deb
-  - sudo dpkg -i --force-confdef elasticsearch-0.90.13.deb
   - sudo service elasticsearch restart
+  - git clone https://github.com/CPAN-API/p5-elasticsearch-model.git
+  - pwd
 
   - cpanm -n Devel::Cover::Report::Coveralls
   - cpanm -n Carton
@@ -53,7 +52,7 @@ script:
   # Devel::Cover isn't in the cpanfile
   # but if it's installed into the global dirs this should work.
   # NOTE: No '-r' for prove; 't/fakecpan.t' does the recursion for us.
-  - HARNESS_PERL_SWITCHES=-MDevel::Cover=+ignore,local carton exec prove -lv t
+  - HARNESS_PERL_SWITCHES=-MDevel::Cover=+ignore,local carton exec prove -lv -I p5-elasticsearch-model/lib t
 
 after_success:
   - cover -report coveralls

diff --git a/cpanfile b/cpanfile
@@ -42,7 +42,7 @@ requires 'Devel::ArgNames';
 requires 'Digest::MD5';
 requires 'Digest::SHA1';
 requires 'EV';
-requires 'ElasticSearchX::Model', '0.1.5';
+requires 'ElasticSearchX::Model', '0.1.7';
 requires 'Email::Address';
 requires 'Email::Sender::Simple';
 requires 'Email::Simple';
@@ -86,7 +86,7 @@ requires 'Log::Log4perl::Appender::ScreenColoredLevels';
 requires 'Module::Metadata', '1.000022';
 requires 'Module::Pluggable';
 requires 'Module::Runtime';
-requires 'Moose', ' == 2.0802'; # Pin to older version to avoid deprecation warning on enum that we can't escape b/c we're pinned to an old version of MX-Types-ES.
+requires 'Moose', ' >= 2.1403';
 requires 'Moose::Role';
 requires 'Moose::Util';
 requires 'MooseX::Aliases';
@@ -99,7 +99,7 @@ requires 'MooseX::Getopt::OptionTypeMap';
 requires 'MooseX::StrictConstructor';
 requires 'MooseX::Types';
 requires 'MooseX::Types::Common::String';
-requires 'MooseX::Types::ElasticSearch', ' == 0.0.2'; # Newer versions use the other ES module which we can't upgrade to yet b/c of ESX-Model.
+requires 'MooseX::Types::ElasticSearch', ' == 0.0.4';
 requires 'MooseX::Types::Moose';
 requires 'MooseX::Types::Path::Class::MoreCoercions';
 requires 'MooseX::Types::Structured';
@@ -134,6 +134,7 @@ requires 'Pod::Simple::XHTML', '3.24';
 requires 'Pod::Text';
 requires 'Regexp::Common';
 requires 'Regexp::Common::time';
+requires 'Search::Elasticsearch';
 requires 'Safe', '2.35'; # bug fixes (used by Parse::PMFile)
 requires 'Starman';
 requires 'Time::Local';